| commit | 1192aa45caa837578ac96d191ebce4ad827fd439 | [log] [tgz] |
|---|---|---|
| author | Tatyana Leontovich <tleontovich@mirantis.com> | Mon Mar 25 14:11:27 2019 +0200 |
| committer | Tatyana Leontovich <tleontovich@mirantis.com> | Thu Mar 28 18:57:41 2019 +0200 |
| tree | bbc64b89b83fbb0dfba3342435da494c41c0984b | |
| parent | 552454c0336a2fbf70d16906bfad8a026f63d27e [diff] [blame] |
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/cookied-model-generator/salt_cookied-cicd-k8s-calico-sl.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-k8s-calico-sl.yaml index 69b7cdb..08c2df1 100644 --- a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-k8s-calico-sl.yaml +++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-k8s-calico-sl.yaml
@@ -14,6 +14,8 @@ {{ SHARED.MACRO_INSTALL_FORMULAS('\*') }} +{{ SHARED.MACRO_UPLOAD_AND_IMPORT_GPG_ENCRYPTION_KEY() }} + {{ SHARED.MACRO_GENERATE_COOKIECUTTER_MODEL() }} {{ SHARED.MACRO_GENERATE_AND_ENABLE_ENVIRONMENT_MODEL() }}