commit 386845b01dbf1bf47f1cbd56b9f794e8b44e1281
author Dennis Dmitriev <ddmitriev@mirantis.com> Tue Nov 21 13:11:12 2017 +0200
committer Dennis Dmitriev <dis.xcom@gmail.com> Tue Nov 21 11:48:39 2017 -0500
tree 450ea6ad4f6c63140095877cc78d35a9d5cc8942
parent c9b677d8c5f29db6c657655cca36ffe9e91ff989

Use overrides.yml from environment model for cookied-mcp-ocata-dop-sl2

Change-Id: Ifb7218be47b46cbc6f5538a03ccdb10648c67d7a

tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml

diff --git a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml
index 4c5b470..1a6a7e3 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/sl.yaml
@@ -1,4 +1,5 @@
 {% from 'cookied-mcp-ocata-dop-sl2/underlay.yaml' import HOSTNAME_CFG01 with context %}
+{% from 'cookied-mcp-ocata-dop-sl2/salt.yaml' import ENVIRONMENT_MODEL_INVENTORY_NAME with context %}
 
 # Install docker swarm
 - description: Install keepalived on mon nodes
@@ -145,12 +146,13 @@
 # Change environment configuration before deploy
 - description: Set SL docker images deploy parameters
   cmd: |
-    touch /srv/salt/reclass/classes/cluster/overrides.yml;
-  {% for sl_opt, value in config.sl_deploy.items() %}
-    {% if value|string() %}
-    salt-call reclass.cluster_meta_set {{ sl_opt }} {{ value }};
-    {% endif %}
-  {% endfor %}
+  {#- For cookiecutter-generated model, use overrides.yml from environment model instead of cluster model #}
+  {%- set OVERRIDES_FILENAME='/srv/salt/reclass/classes/environment/' + ENVIRONMENT_MODEL_INVENTORY_NAME + '/overrides.yml' %}
+  {%- for sl_opt, value in config.sl_deploy.items() %}
+    {%- if value|string() %}
+    salt-call reclass.cluster_meta_set name={{ sl_opt }} value={{ value }} file_name={{ OVERRIDES_FILENAME }};
+    {%- endif %}
+  {%- endfor %}
     salt '*' saltutil.refresh_pillar;
     sleep 10
   node_name: {{ HOSTNAME_CFG01 }}