Add overrides.yml usage to nodes in enviromnet model
Change-Id: Idd051c3a989828fea3f3e1a3624d66d47e74ee5f
Reviewed-on: https://review.gerrithub.io/377552
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>
diff --git "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/overrides" "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/overrides"
new file mode 100644
index 0000000..ce3e4b1
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/overrides"
@@ -0,0 +1,9 @@
+{#-
+parameters:
+ reclass:
+ storage:
+ node:
+ <reclass_storage_node_name>:
+ classes:
+#}
+ - environment.{{ cookiecutter._env_name }}.overrides
\ No newline at end of file
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml"
index b2588b8..c1c1b12 100644
--- "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml"
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml"
@@ -12,8 +12,9 @@
{# 'params' dict object is dynamically generated from 'roles' to add on the node #}
{%- set params = {} %}
classes:
- {#- Default role linux_network_interface is added to each node #}
- {%- for role in node.get('roles', []) + ['linux_network_interface'] %}
+ {#- Default roles are added to each node #}
+ {#- 'overrides' must be the very last role for each node #}
+ {%- for role in node.get('roles', []) + ['linux_network_interface', 'overrides'] %}
{%- include ("{# roles #}/" + role) %}
{%- endfor %}
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/overrides.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/overrides.yml"
new file mode 100644
index 0000000..2c44db5
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/overrides.yml"
@@ -0,0 +1,6 @@
+# Do not delete! This file is for global parameters overrides over all the nodes in the environment.
+# Example: salt-call reclass.cluster_meta_set foo bar
+parameters:
+ _param:
+ cluster_public_protocol: http
+ neutron_public_protocol: http
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt.yaml
index 3da0df6..b777ee0 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt.yaml
@@ -81,7 +81,6 @@
# Enable 'root' user
reclass-tools add-key classes system.openssh.server.team.all /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config.yml --merge
-
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 1}
skip_fail: false