commit 04e62dd70b5c5b4e722851b21651af06a3b7a913
author Dennis Dmitriev <ddmitriev@mirantis.com> Tue Sep 26 19:06:42 2017 +0300
committer Tatyanka Leontovich <tleontovich@mirantis.com> Tue Sep 26 12:10:39 2017 -0400
tree 511cba70ca4ee5dbe32ee655d4e4600e5855c79e
parent a0f43c3089733f1375a31f0ee356e30d1379297c

Combine dns role with control nodes

Workaround for: #PROD-14831

Change-Id: Ia11a50edd9102532f1b2b2cef0377fa742e9b7af
Reviewed-on: https://review.gerrithub.io/380033
Reviewed-by: Tatyanka Leontovich <tleontovich@mirantis.com>
Tested-by: Tatyanka Leontovich <tleontovich@mirantis.com>

tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml

diff --git a/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml b/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml
index a5e0d14..3cd7087 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml
@@ -16,6 +16,22 @@
 
 {{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }}
 
+- description: "Workaround for PROD-14831 , add 'dns' role to ctl01 and ctl02 nodes"
+  cmd: |
+    set -e;
+    apt-get -y install python-virtualenv python-pip build-essential python-dev libssl-dev;
+    pip install git+https://github.com/dis-xcom/reclass-tools;
+    reclass-tools add-key 'parameters.reclass.storage.node.openstack_control_node01.classes' 'cluster.{{ LAB_CONFIG_NAME }}.openstack.dns' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml --merge;
+    reclass-tools add-key 'parameters.reclass.storage.node.openstack_control_node02.classes' 'cluster.{{ LAB_CONFIG_NAME }}.openstack.dns' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml --merge;
+
+    export REPLACE_DIRS="/srv/salt/reclass/classes/ /srv/salt/reclass/nodes/"
+    find ${REPLACE_DIRS} -type f -exec sed -i 's/openstack_dns_node01_address:.*/openstack_dns_node01_address: ${_param:openstack_control_node01_address}/g' {} +
+    find ${REPLACE_DIRS} -type f -exec sed -i 's/openstack_dns_node02_address:.*/openstack_dns_node02_address: ${_param:openstack_control_node02_address}/g' {} +
+
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 10}
+  skip_fail: false
+
 {{ SHARED.MACRO_GENERATE_INVENTORY() }}
 
 {{ SHARED.MACRO_BOOTSTRAP_ALL_MINIONS() }}