commit 51483681b6c82f8633eae902fb2686efc398ee9c
author Dennis Dmitriev <ddmitriev@mirantis.com> Fri Nov 23 10:54:11 2018 +0200
committer Dennis Dmitriev <ddmitriev@mirantis.com> Fri Nov 23 10:54:11 2018 +0200
tree a5db23926a4a78cfa4bf8bac968c2abcd4a330d4
parent 9e84dc468cd526fec1c6557c7f886a4dc766528b

Fix clonning reclass-system from ssh+git

- use ssh-agent for all macros where reclass-system is cloned
- use ssh-agent only if COOKIECUTTER_TEMPLATES_REPOSITORY_KEY_PATH
  is set

Change-Id: I1672947619e9b41f5ca62bf7c853badbc9c6515a

tcp_tests/templates/shared-salt.yaml

diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 7b041aa..2a4e8cd 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -232,6 +232,12 @@
     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;
@@ -367,12 +373,14 @@
   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: |
@@ -381,9 +389,12 @@
     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 != '' %}
@@ -460,6 +471,13 @@
   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(" ") %}