Fix model
Change-Id: If9831e47a5da6df5c7db36533fde1a50acc5b95d
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/openstack.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/openstack.yaml
index c2e88f6..63e5402 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/openstack.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/openstack.yaml
@@ -268,19 +268,19 @@
retry: {count: 1, delay: 30}
skip_fail: false
-- description: Allow all icmp
- cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl01*' cmd.run
- '. /root/keystonercv3; nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0'
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 30}
- skip_fail: false
+#- description: Allow all icmp
+# cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl01*' cmd.run
+# '. /root/keystonercv3; nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0'
+# node_name: {{ HOSTNAME_CFG01 }}
+# retry: {count: 1, delay: 30}
+# skip_fail: false
-- description: sync time
- cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' cmd.run
- 'service ntp stop; ntpd -gq; service ntp start'
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 30}
- skip_fail: false
+#- description: sync time
+# cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' cmd.run
+# 'service ntp stop; ntpd -gq; service ntp start'
+# node_name: {{ HOSTNAME_CFG01 }}
+# retry: {count: 1, delay: 30}
+# skip_fail: false
- description: Temp workaround of PROD-13167
cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl*' cmd.run
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-cookiecutter-openstack_ovs_dvr_vxlan.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-cookiecutter-openstack_ovs_dvr_vxlan.yaml
index 215c3d8..2c5b112 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-cookiecutter-openstack_ovs_dvr_vxlan.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-cookiecutter-openstack_ovs_dvr_vxlan.yaml
@@ -78,8 +78,8 @@
openstack_gateway_node01_hostname: gtw01
openstack_gateway_node01_tenant_address: 10.167.6.6
openstack_gateway_node02_address: 10.167.4.225
- #openstack_gateway_node02_hostname: gtw02
- #openstack_gateway_node02_tenant_address: 10.167.6.7
+ openstack_gateway_node02_hostname: gtw02
+ openstack_gateway_node02_tenant_address: 10.167.6.7
openstack_message_queue_address: 10.167.4.40
openstack_message_queue_hostname: msg
openstack_message_queue_node01_address: 10.167.4.41
@@ -102,7 +102,8 @@
openstack_proxy_node01_hostname: prx01
openstack_proxy_node02_address: 10.167.4.82
openstack_proxy_node02_hostname: prx02
- openstack_version: ocata
+ openstack_version: pike
+ cinder_version: ${_param:openstack_version}
oss_enabled: 'False'
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}