commit f28e036cc388b75bd1e0f64b37b3e8fdc727861a
author Dennis Dmitriev <ddmitriev@mirantis.com> Mon Feb 19 14:38:09 2018 +0200
committer Dennis Dmitriev <ddmitriev@mirantis.com> Mon Feb 19 14:38:09 2018 +0200
tree 4f1aca135faf49d26c2ac57f78e55877617e49fb
parent 70c558ed97100e088d3a5b95dc75bd7cbc563652

Remove all except _param from infra.config_orig

Change-Id: I8eb6b2c9fdfa6e48495df5ad7299849f40eb693e

tcp_tests/templates/shared-salt.yaml

diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index e230243..fd05bcc 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -394,6 +394,11 @@
       cp /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config_orig.yml;
       # Remove parameters:_param from the infra.config to have possibility to override them from the environment classes
       reclass-tools del-key parameters._param /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml;
+      reclass-tools del-key classes /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config_orig.yml;
+      reclass-tools del-key parameters.jenkins /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config_orig.yml;
+      reclass-tools del-key parameters.salt /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config_orig.yml;
+      reclass-tools del-key parameters.reclass /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config_orig.yml;
+
       reclass-tools add-key 'classes' 'cluster.{{ CLUSTER_NAME }}.infra.config_orig' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml --merge;
       reclass-tools add-key 'classes' 'environment.{{ ENVIRONMENT_MODEL_INVENTORY_NAME }}.reclass_datasource_local' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml --merge;
       reclass-tools add-key 'classes' 'environment.{{ ENVIRONMENT_MODEL_INVENTORY_NAME }}' /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/infra/config.yml --merge;