Run sshuttle after configuring openssh keys on minions
Change-Id: Ibd20dfb89b6b938b62f7b2cb963fd08ce6e6fd6d
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-dvr-vxlan/salt.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-dvr-vxlan/salt.yaml
index 75b1b5c..d24aca1 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-dvr-vxlan/salt.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-dvr-vxlan/salt.yaml
@@ -63,6 +63,12 @@
{{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }}
+{{ SHARED.MACRO_GENERATE_INVENTORY() }}
+
+{{ SHARED.MACRO_NETWORKING_WORKAROUNDS() }}
+
+{{ SHARED.MACRO_BOOTSTRAP_ALL_MINIONS() }}
+
- description: "Lab03 workaround: Control network access from cfg01 node using sshuttle via kvm01"
cmd: |
set -e;
@@ -73,12 +79,6 @@
retry: {count: 1, delay: 5}
skip_fail: false
-{{ SHARED.MACRO_GENERATE_INVENTORY() }}
-
-{{ SHARED.MACRO_NETWORKING_WORKAROUNDS() }}
-
-{{ SHARED.MACRO_BOOTSTRAP_ALL_MINIONS() }}
-
########################################
# Spin up Control Plane VMs on KVM nodes
########################################