Add retry on service check
Change-Id: Ib5ee69c8e0a704f2430a5d93339de3a1bec51b0b
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl-barbican/openstack.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl-barbican/openstack.yaml
index 613de4c..83efcd3 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl-barbican/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl-barbican/openstack.yaml
@@ -451,9 +451,9 @@
- description: WR https://mirantis.jira.com/browse/PROD-19012
cmd: |
- salt 'ctl*' cmd.run 'systemctl reload apache2'
+ salt 'ctl*' cmd.run 'systemctl restart apache2'
node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
+ retry: {count: 3, delay: 15}
skip_fail: false
- description: Check manila-services
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/openstack.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/openstack.yaml
index 1a1a0e1..ac6dbe6 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/openstack.yaml
@@ -436,7 +436,7 @@
- description: WR https://mirantis.jira.com/browse/PROD-19012
cmd: |
- salt 'ctl*' cmd.run 'systemctl reload apache2'
+ salt 'ctl*' cmd.run 'systemctl restart apache2'
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
@@ -445,7 +445,7 @@
cmd: |
salt 'ctl01*' cmd.run '. /root/keystonercv3; manila service-list'
node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
+ retry: {count: 3, delay: 15}
skip_fail: false
- description: Create manila type
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr/openstack.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr/openstack.yaml
index 8950079..9c524fd 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr/openstack.yaml
@@ -430,7 +430,7 @@
- description: WR https://mirantis.jira.com/browse/PROD-19012
cmd: |
- salt 'ctl*' cmd.run 'systemctl reload apache2'
+ salt 'ctl*' cmd.run 'systemctl restart apache2'
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
@@ -439,7 +439,7 @@
cmd: |
salt 'ctl01*' cmd.run '. /root/keystonercv3; manila service-list'
node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
+ retry: {count: 3, delay: 15}
skip_fail: false
- description: Create manila type
diff --git a/tcp_tests/templates/virtual-mcp-pike-ovs/openstack.yaml b/tcp_tests/templates/virtual-mcp-pike-ovs/openstack.yaml
index e1a57e5..b08d04b 100644
--- a/tcp_tests/templates/virtual-mcp-pike-ovs/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-ovs/openstack.yaml
@@ -457,7 +457,7 @@
- description: WR https://mirantis.jira.com/browse/PROD-19012
cmd: |
- salt 'ctl*' cmd.run 'systemctl reload apache2'
+ salt 'ctl*' cmd.run 'systemctl restart apache2'
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
@@ -466,7 +466,7 @@
cmd: |
salt 'ctl01*' cmd.run '. /root/keystonercv3; manila service-list'
node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
+ retry: {count: 3, delay: 15}
skip_fail: false
- description: Create manila type