Partly drop injection of ssh key
https://gerrit.mcp.mirantis.com/#/c/37337/8
Intorduces drop of harcoded keys, so to test that we need:
* 1 deploy with key encrypted true + generated ssh keys
* 1 deploy woth key encrypted false + generated ssh key
* 1 deploy with key encrypted true + injected key
* 1 deploy with key encrupyed false + injected key
* Fix salt-master gpg key import
Change-Id: Ia1d2ca3fbb3275b90a61dc16817e918db7bc97e4
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index e592994..e19b15c 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -343,8 +343,10 @@
- description: Import encryption key
cmd: |
- set -e;
- set -x;
+ set -ex;
+ mkdir -p /etc/salt/gpgkeys
+ chmod 0700 /etc/salt/gpgkeys
+ export GNUPGHOME=/etc/salt/gpgkeys
gpg --import {{ KEY_FILE_NAME }}
gpg --list-keys
node_name: {{ HOSTNAME_CFG01 }}
@@ -483,6 +485,8 @@
{% set items = CLUSTER_PRODUCT_MODELS or '$(ls /root/cookiecutter-templates/cluster_product/)' %}
mkdir -p /tmp/output /srv/salt/reclass/classes/cluster/{{ CLUSTER_NAME }}/
+ # Allow to use encryption keys
+ export GNUPGHOME=/etc/salt/gpgkeys
for item in {{ items }}; do
[ "$item" = "stacklight2" ] && continue;
python /root/cookiecutter-templates/generate.py \