Fix DevStack CI jobs

Change-Id: I5af61a34c5643874af1c2a6525072dd1d4f8845e
2019-11-15 18:38:01 +01:00
parent bbd005ce52
commit 1fa8dfe997
9 changed files with 66 additions and 26 deletions
--- a/playbooks/multinode-devstack-pre-run.yaml
+++ b/playbooks/multinode-devstack-pre-run.yaml
@@ -1,3 +0,0 @@
- hosts: all
-  roles:
-    - multi-node-setup
--- a/playbooks/tobiko-devstack-post-run.yaml
+++ b/playbooks/tobiko-devstack-post-run.yaml
--- a/playbooks/tobiko-devstack-pre-run.yaml
+++ b/playbooks/tobiko-devstack-pre-run.yaml
@@ -40,3 +40,13 @@
  roles:
    - role: copy-build-sshkey
      copy_sshkey_target_user: stack
+
+
+- hosts: all
+  roles:
+    - multi-node-setup
+
+
+- hosts: all
+  roles:
+    - orchestrate-devstack
--- a/playbooks/tobiko-devstack-run.yaml
+++ b/playbooks/tobiko-devstack-run.yaml
@@ -14,13 +14,6 @@

 ---

-# Changes that run through tobiko-devstack are likely to have an impact on
-# the devstack part of the job, so we keep devstack in the main play to
-# avoid zuul retrying on legitimate failures.
- hosts: all
-  roles:
-    - orchestrate-devstack
-
 - hosts: tempest
  roles:
    - run-tox