summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaifeng Wang <kaifeng.w@gmail.com>2018-10-11 09:59:29 +0800
committerKaifeng Wang <kaifeng.w@gmail.com>2018-10-11 09:59:29 +0800
commit4f2f4d8f70fcf6f7f6147e8a5e8b20742b69828b (patch)
tree8cc8822b29d06e95dfc71b2787ca2e7a8f312270
parent5bfba3852d9b7573193c7dfe26a4d1991bfbee46 (diff)
Test swift python3 support
Notes
Notes (review): Code-Review+2: Dmitry Tantsur <divius.inside@gmail.com> Code-Review+1: Iury Gregory Melo Ferreira <iurygregory@gmail.com> Code-Review+2: Ruby Loo <opensrloo@gmail.com> Workflow+1: Ruby Loo <opensrloo@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 12 Oct 2018 15:50:12 +0000 Reviewed-on: https://review.openstack.org/609573 Project: openstack/ironic-inspector Branch: refs/heads/master
-rw-r--r--devstack/plugin.sh3
-rw-r--r--playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml16
2 files changed, 1 insertions, 18 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index e1d61ff..d5170a4 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -267,8 +267,7 @@ function configure_inspector {
267 inspector_iniset iptables dnsmasq_interface $IRONIC_INSPECTOR_INTERFACE 267 inspector_iniset iptables dnsmasq_interface $IRONIC_INSPECTOR_INTERFACE
268 inspector_iniset database connection `database_connection_url ironic_inspector` 268 inspector_iniset database connection `database_connection_url ironic_inspector`
269 269
270 # FIXME(ankit) Remove this when swift supports python3 270 if is_service_enabled swift; then
271 if [[ "$USE_PYTHON3" == "False" ]] && is_service_enabled swift; then
272 configure_inspector_swift 271 configure_inspector_swift
273 fi 272 fi
274 273
diff --git a/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml b/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml
index ac6259e..23cd27b 100644
--- a/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml
+++ b/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml
@@ -34,22 +34,6 @@
34 34
35 - shell: 35 - shell:
36 cmd: | 36 cmd: |
37 set -e
38 set -x
39 cat << 'EOF' >>"/tmp/dg-local.conf"
40 [[local|localrc]]
41 disable_service s-account
42 disable_service s-container
43 disable_service s-object
44 disable_service s-proxy
45
46 EOF
47 executable: /bin/bash
48 chdir: '{{ ansible_user_dir }}/workspace'
49 environment: '{{ zuul | zuul_legacy_vars }}'
50
51 - shell:
52 cmd: |
53 cat << 'EOF' >> ironic-extra-vars 37 cat << 'EOF' >> ironic-extra-vars
54 export DEVSTACK_GATE_TEMPEST_REGEX="Inspector" 38 export DEVSTACK_GATE_TEMPEST_REGEX="Inspector"
55 EOF 39 EOF