3 files changed, 1 insertions, 71 deletions
diff --git a/playbooks/legacy/nova-multiattach/post.yaml b/playbooks/legacy/nova-multiattach/post.yaml
deleted file mode 100644
index e07f5510ae..0000000000
--- a/playbooks/legacy/nova-multiattach/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- hosts: primary
-  tasks:
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/logs/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/nova-multiattach/run.yaml b/playbooks/legacy/nova-multiattach/run.yaml
deleted file mode 100644
index 4ba92417a4..0000000000
--- a/playbooks/legacy/nova-multiattach/run.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- hosts: all
-  name: nova-multiattach
-  tasks:
-
-    - name: Ensure workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          ENABLE_VOLUME_MULTIATTACH=True
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          # Yes we want to run Tempest.
-          export DEVSTACK_GATE_TEMPEST=1
-          # Only run compute API tests; note that this will need to
-          # be updated if multiattach scenario tests are ever added.
-          export DEVSTACK_GATE_TEMPEST_REGEX="api.compute"
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/nova-next/run.yaml b/playbooks/legacy/nova-next/run.yaml
index e24fdadac1..b8d5175f3f 100644
--- a/playbooks/legacy/nova-next/run.yaml
+++ b/playbooks/legacy/nova-next/run.yaml
@@ -24,9 +24,6 @@
       environment: '{{ zuul | zuul_legacy_vars }}'
 
     - shell:
-        # TODO(mriedem): Consider setting USE_PYTHON3=True here to make this
-        # job run under python 3.5 which is a "next" type thing.
-
         # Enable TLS between the noVNC proxy & compute nodes; this requires
         # the tls-proxy service to be enabled.
 
@@ -43,6 +40,7 @@
           NOVA_USE_SERVICE_TOKEN=True
           NOVA_CONSOLE_PROXY_COMPUTE_TLS=True
           PLACEMENT_DB_ENABLED=True
+          USE_PYTHON3=True
 
           [[post-config|$NOVA_CONF]]
           [compute]