Browse Source

Test swift python3 support

Change-Id: I22766ea3f96c2b0911e1fa3219fab5411fa2b5fc
Kaifeng Wang 6 months ago
parent
commit
4f2f4d8f70

+ 1
- 2
devstack/plugin.sh View File

@@ -267,8 +267,7 @@ function configure_inspector {
267 267
     inspector_iniset iptables dnsmasq_interface $IRONIC_INSPECTOR_INTERFACE
268 268
     inspector_iniset database connection `database_connection_url ironic_inspector`
269 269
 
270
-    # FIXME(ankit) Remove this when swift supports python3
271
-    if [[ "$USE_PYTHON3" == "False" ]] && is_service_enabled swift; then
270
+    if is_service_enabled swift; then
272 271
         configure_inspector_swift
273 272
     fi
274 273
 

+ 0
- 16
playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml View File

@@ -32,22 +32,6 @@
32 32
         chdir: '{{ ansible_user_dir }}/workspace'
33 33
       environment: '{{ zuul | zuul_legacy_vars }}'
34 34
 
35
-    - shell:
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 35
     - shell:
52 36
         cmd: |
53 37
           cat << 'EOF' >> ironic-extra-vars

Loading…
Cancel
Save