commit 4ab889cc0762f6152a82e8dbccd129a6df956da9
author Dennis Dmitriev <ddmitriev@mirantis.com> Thu Apr 27 14:11:04 2017 +0300
committer Dennis Dmitriev <dis.xcom@gmail.com> Thu Apr 27 14:23:00 2017 +0300
tree 523386ed27366cfffd60095ac25a2916c1b98ec8
parent 5e81a4bbce7bd9b316cfa252c9f776e2df6ae639

Use dynamic IP networks for mcp-ocata-ovs/dvr models

tcp_tests/templates/common-services/virtual-mcp-ocata-dvr-common-services.yaml

diff --git a/tcp_tests/templates/common-services/virtual-mcp-ocata-dvr-common-services.yaml b/tcp_tests/templates/common-services/virtual-mcp-ocata-dvr-common-services.yaml
index 319bffb..40c038c 100644
--- a/tcp_tests/templates/common-services/virtual-mcp-ocata-dvr-common-services.yaml
+++ b/tcp_tests/templates/common-services/virtual-mcp-ocata-dvr-common-services.yaml
@@ -1,4 +1,4 @@
-{% from 'virtual-mcp-ocata-dvr.jinja' import HOSTNAME_CFG01 with context %}
+{% from 'underlay/virtual-mcp-ocata-dvr.yaml' import HOSTNAME_CFG01 with context %}
 
 # Install support services
 - description: Install keepalived on ctl01
@@ -16,8 +16,10 @@
   skip_fail: true
 
 - description: Check the VIP
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@keepalived:cluster' cmd.run 'ip a | grep 172.16.10.2' | grep -B1 172.16.10.2
+  cmd: |
+    OPENSTACK_CONTROL_ADDRESS=`salt-call --out=newline_values_only pillar.get _param:openstack_control_address`;
+    echo "_param:openstack_control_address (vip): ${OPENSTACK_CONTROL_ADDRESS}";
+    salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@keepalived:cluster' cmd.run "ip a | grep ${OPENSTACK_CONTROL_ADDRESS}" | grep -B1 ${OPENSTACK_CONTROL_ADDRESS}
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false