commit 5921bb26f4661df29388f2d17e21467bc81b39fd
author ibumarskov <ibumarskov@mirantis.com> Mon Jun 25 16:49:37 2018 +0400
committer ibumarskov <ibumarskov@mirantis.com> Wed Jun 27 09:35:49 2018 +0400
tree 63c8c5f5cd2fe272ab1742cc33848d47cfd178fa
parent 86fc2a47d772e38238f1d063a600f4827c19ddee

Add OVVERIDES for mitaka/ocata templates

Change mechanism of override parameters for virtual-mcp-trusty &
virtual-mcp-ls-os templates to default (reclass.cluster_meta_set).

Change-Id: Ife4f428e372cb761d8478f297f14913487eb913f

tcp_tests/templates/virtual-mcp-trusty/salt.yaml

diff --git a/tcp_tests/templates/virtual-mcp-trusty/salt.yaml b/tcp_tests/templates/virtual-mcp-trusty/salt.yaml
index d042292..24a3ef1 100644
--- a/tcp_tests/templates/virtual-mcp-trusty/salt.yaml
+++ b/tcp_tests/templates/virtual-mcp-trusty/salt.yaml
@@ -4,7 +4,7 @@
 
 {% set SALT_MODELS_REPOSITORY = os_env('SALT_MODELS_REPOSITORY','https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab') %}
 # Other salt model repository parameters see in shared-salt.yaml
-{% set OVERRIDES = os_env('OVERRIDES', '') %}
+{% set OVERRIDES = os_env('OVERRIDES', 'override_example: true') %}
 {% set OVERRIDES_FILENAME = os_env('OVERRIDES_FILENAME', '/srv/salt/reclass/classes/cluster/overrides.yml') %}
 
 {% import 'shared-salt.yaml' as SHARED with context %}
@@ -20,16 +20,11 @@
 {{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }}
 
 {%- if OVERRIDES != '' %}
-- description: Clear {{OVERRIDES_FILENAME}}
-  cmd: touch {{OVERRIDES_FILENAME}}
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 1}
-  skip_fail: false
-
 {%- for param in OVERRIDES.splitlines() %}
+{%- set key, value = param.replace(' ','').split(':') %}
 - description: Override cluster parameters
   cmd: |
-    echo -e "{{ param }}" >> {{OVERRIDES_FILENAME}}
+    salt-call reclass.cluster_meta_set name='{{ key }}' value='{{ value }}' file_name='{{OVERRIDES_FILENAME}}'
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 1}
   skip_fail: false