Remove /srv/salt/reclass/nodes/
cfg* nodes were removed from mcp-virtual-lab, but
were remaining in mcp-baremetal-lab
In shared-salt.yml, cfg01 node is created under _generated
node. To not make doublicates, let's remove the original
directory /nodes and regenerate cfg* nodes for any environment.
Change-Id: I052f19644bc7e84568c9eb2edd94f9747bf7e7b6
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index a529543..a954be7 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -112,6 +112,7 @@
{%- endif %}
popd;
mkdir -p /srv/salt/reclass/classes/service;
+ rm -rf /srv/salt/reclass/nodes/ # For backward compatibility. New cfg node will be regenerated here
mkdir -p /srv/salt/reclass/nodes/_generated/;
# Replace firstly to an intermediate value to avoid intersection between
@@ -183,6 +184,7 @@
mkdir -p /srv/salt/reclass/classes/cluster/
mkdir -p /srv/salt/reclass/classes/system/
mkdir -p /srv/salt/reclass/classes/service/
+ rm -rf /srv/salt/reclass/nodes/ # For backward compatibility. New cfg node will be regenerated here
mkdir -p /srv/salt/reclass/nodes/_generated
# Override some context parameters