Create new test group for mcp+trusty models
Additionally: add 'sync time' step in virtual-mcp-trusty template
Change-Id: Ia03c017d1b7037f5e9528dd0235c9e86be4e3e24
diff --git a/tcp_tests/templates/virtual-mcp-trusty/openstack.yaml b/tcp_tests/templates/virtual-mcp-trusty/openstack.yaml
index c1eb756..b122cfa 100644
--- a/tcp_tests/templates/virtual-mcp-trusty/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp-trusty/openstack.yaml
@@ -7,12 +7,17 @@
{% from 'shared-salt.yaml' import IPV4_NET_TENANT_PREFIX with context %}
# Install OpenStack control services
+- description: Sync time
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False -G 'oscodename:trusty' cmd.run "service ntp stop && ntpdate pool.ntp.org && service ntp start"
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
- description: Install glance on all controllers
cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-C 'I@glance:server' state.sls glance -b 1
node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 3, delay: 30}
+ retry: {count: 1, delay: 5}
skip_fail: false
- description: Install keystone service (note that different fernet keys are created on different nodes)
@@ -126,7 +131,7 @@
cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-C 'I@designate:server' state.sls designate -b 1
node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 5, delay: 10}
+ retry: {count: 1, delay: 10}
skip_fail: true
- description: Check neutron agent-list