Use the environment model template from Mirantis/environment-template
- remove environment/environment-template folder. Use the repo [1]
- move environment/environment_inventory to the repo [1]
to the inventory_examples
[1] https://github.com/Mirantis/environment-template
Change-Id: I1cc70f864343fdebfe54cc66d251a9133dce9e88
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 906018a..2927e21 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -270,10 +270,11 @@
{%- macro MACRO_GENERATE_AND_ENABLE_ENVIRONMENT_MODEL() %}
{########################################################}
-- description: "[EXPERIMENTAL] Upload 'environment' to {{ HOSTNAME_CFG01 }}"
- upload:
- local_path: {{ config.salt_deploy.environment_template_dir }}
- remote_path: /tmp/environment/
+- description: "[EXPERIMENTAL] Clone 'environment-template' repository to {{ HOSTNAME_CFG01 }}"
+ cmd: |
+ set -e;
+ mkdir -p /tmp/environment/;
+ export GIT_SSL_NO_VERIFY=true; git clone https://github.com/Mirantis/environment-template /tmp/environment/environment_template
node_name: {{ HOSTNAME_CFG01 }}
skip_fail: false
@@ -317,8 +318,6 @@
- description: "[EXPERIMENTAL] Create environment model for virtual environment"
cmd: |
set -e;
- ln -s '/tmp/environment/environment_template/{{ '{# interfaces #}' }}' '/tmp/environment/environment_template/{{ '{{ cookiecutter._env_name }}' }}/';
- ln -s '/tmp/environment/environment_template/{{ '{# roles #}' }}' '/tmp/environment/environment_template/{{ '{{ cookiecutter._env_name }}' }}/';
reclass-tools render --template-dir /tmp/environment/environment_template/ \
--output-dir /srv/salt/reclass/classes/environment/ \
{% for ENVIRONMENT_CONTEXT_NAME in ENVIRONMENT_CONTEXT_NAMES %} --context /tmp/environment/{{ENVIRONMENT_CONTEXT_NAME}}{% endfor %} \