commit f160e9abb980763c80aa2573dff18e00189c6c45
author Dennis Dmitriev <dis.xcom@gmail.com> Fri Nov 23 11:02:15 2018 +0000
committer Dennis Dmitriev <dis.xcom@gmail.com> Fri Nov 23 11:02:15 2018 +0000
tree 00e70ba5fa53394e13a2e9558be60e4642b63204
parent 51483681b6c82f8633eae902fb2686efc398ee9c

Revert "Fix clonning reclass-system from ssh+git"

This reverts commit 51483681b6c82f8633eae902fb2686efc398ee9c.

Change-Id: Ibbdbbf6758d055ff05283e716ef8f722d92c71ad

tcp_tests/templates/shared-salt.yaml

diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 2a4e8cd..7b041aa 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -232,12 +232,6 @@
     export GIT_SSL_NO_VERIFY=true; git clone -b {{ SALT_MODELS_BRANCH }} {{ SALT_MODELS_REPOSITORY }} /srv/salt/reclass.tmp;
     rsync -a /srv/salt/reclass.tmp/ /srv/salt/reclass;
 
-    {%- if COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH != '' %}
-    chmod 0600 /tmp/{{ COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH | basename }}
-    eval $(ssh-agent)
-    ssh-add /tmp/{{ COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH | basename }}
-    {%- endif %}
-
     pushd /srv/salt/reclass;
     git config submodule."classes/system".url "{{ SALT_MODELS_SYSTEM_REPOSITORY }}";
     git submodule update --init --recursive;
@@ -373,14 +367,12 @@
   retry: {count: 1, delay: 1}
   skip_fail: false
 
-{%- if COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH != '' %}
 - description: "Upload {{ COOKIECUTTER_TEMPLATES_REPOSITORY_USER }} key"
   upload:
     local_path: {{ COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH | dirname }}/
     local_filename: {{ COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH | basename }}
     remote_path: /tmp/
   node_name: {{ HOSTNAME_CFG01 }}
-{%- endif %}
 
 - description: Create cluster model from cookiecutter templates
   cmd: |
@@ -389,12 +381,9 @@
     sudo apt-get install python-setuptools -y
     pip install cookiecutter
 
-    {%- if COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH != '' %}
     chmod 0600 /tmp/{{ COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH | basename }}
     eval $(ssh-agent)
     ssh-add /tmp/{{ COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH | basename }}
-    {%- endif %}
-
     export GIT_SSL_NO_VERIFY=true; git clone {{ COOKIECUTTER_TEMPLATES_REPOSITORY }} /root/cookiecutter-templates
 
     {%- if COOKIECUTTER_REF_CHANGE != '' %}
@@ -471,13 +460,6 @@
   cmd: |
     set -e;
     set -x;
-
-    {%- if COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH != '' %}
-    chmod 0600 /tmp/{{ COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH | basename }}
-    eval $(ssh-agent)
-    ssh-add /tmp/{{ COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH | basename }}
-    {%- endif %}
-
     {%- if SALT_MODELS_SYSTEM_REF_CHANGE != '' %}
     pushd /srv/salt/reclass/classes/system/ && \
     {%- for item in SALT_MODELS_SYSTEM_REF_CHANGE.split(" ") %}