Move deletion of harcoded host from day01 grains to first step in macro
Change-Id: Iec726172f3e7d6478757d8bb4025139797a758e3
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 1f4ced5..80acaaf 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -761,6 +761,12 @@
{# Prepare salt services and nodes settings #}
+- description: '*Workaround* of harcoded host from day01 grains'
+ cmd: salt-key -d cfg01.mcp-day01.local -y
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 1}
+ skip_fail: true
+
- description: Run 'linux' formula on cfg01
cmd: salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@salt:master' state.sls linux;
node_name: {{ HOSTNAME_CFG01 }}
@@ -777,12 +783,6 @@
retry: {count: 3, delay: 5}
skip_fail: false
-- description: '*Workaround* of harcoded host from day01 grains'
- cmd: salt-key -d cfg01.mcp-day01.local -y
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 1}
- skip_fail: true
-
- description: '*Workaround* of the bug https://mirantis.jira.com/browse/PROD-7962'
cmd: salt --hard-crash --state-output=mixed --state-verbose=False
'*' cmd.run "echo ' StrictHostKeyChecking no' >> /root/.ssh/config"