Remove ens4 from 'dns' role to avoid conflict with compute node
Change-Id: Ia1219bb4f503487daa2e7be33648c0dfbc24152b
diff --git a/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml b/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml
index 0f1cac6..2a8414a 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-dvr/salt.yaml
@@ -22,7 +22,11 @@
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;
+
+ # Combine 'dns' role with compute nodes
reclass-tools add-key 'classes' 'cluster.{{ LAB_CONFIG_NAME }}.openstack.dns' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/compute.yml --merge;
+ # Remove linux.network.interface hardcode from 'dns' role to avoid conflict with compute interfaces
+ reclass-tools del-key parameters.linux.network.interface /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/dns.yml
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: {{ SHARED.IPV4_NET_CONTROL_PREFIX }}.105/g' {} +