From 4f2f4d8f70fcf6f7f6147e8a5e8b20742b69828b Mon Sep 17 00:00:00 2001 From: Kaifeng Wang Date: Thu, 11 Oct 2018 09:59:29 +0800 Subject: [PATCH] Test swift python3 support Change-Id: I22766ea3f96c2b0911e1fa3219fab5411fa2b5fc --- devstack/plugin.sh | 3 +-- .../run.yaml | 16 ---------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index e1d61ffe2..d5170a441 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -267,8 +267,7 @@ function configure_inspector { inspector_iniset iptables dnsmasq_interface $IRONIC_INSPECTOR_INTERFACE inspector_iniset database connection `database_connection_url ironic_inspector` - # FIXME(ankit) Remove this when swift supports python3 - if [[ "$USE_PYTHON3" == "False" ]] && is_service_enabled swift; then + if is_service_enabled swift; then configure_inspector_swift fi diff --git a/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml b/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml index ac6259e3f..23cd27b18 100644 --- a/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml +++ b/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml @@ -32,22 +32,6 @@ chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - disable_service s-account - disable_service s-container - disable_service s-object - disable_service s-proxy - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - shell: cmd: | cat << 'EOF' >> ironic-extra-vars