diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-19 12:22:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-19 12:22:19 +0000 |
| commit | 00839253ec6cc31fdabe7cacdc23b9ffadfb2bba (patch) | |
| tree | 2507df769d44a37f4b98d95ee78de0cfca48fc3a /ci/deploy.sh | |
| parent | 30993030ea4b5a35ab4ae9d0aeb6be85c1e259c3 (diff) | |
| parent | af65ce60c5ab69816cbe8b4c1c7b4c5922304205 (diff) | |
Merge "[patch] MaaS: mcp.rsa.pub to auth keys via pillar"
Diffstat (limited to 'ci/deploy.sh')
| -rwxr-xr-x | ci/deploy.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index ed438324b..c883616f1 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -280,6 +280,10 @@ eval "$(parse_yaml "${SCENARIO_DIR}/defaults-$(uname -i).yaml")" eval "$(parse_yaml "${SCENARIO_DIR}/${DEPLOY_SCENARIO}.yaml")" export CLUSTER_DOMAIN=${cluster_domain} +# key might not exist yet ... +generate_ssh_key +export MAAS_SSH_KEY="$(cat "$(basename "${SSH_KEY}").pub")" + # Expand jinja2 templates based on PDF data and env vars do_templates "${REPO_ROOT_PATH}" "${STORAGE_DIR}" "${TARGET_LAB}" \ "${TARGET_POD}" "${BASE_CONFIG_URI}" @@ -336,7 +340,6 @@ elif [ ${USE_EXISTING_INFRA} -gt 0 ]; then notify "[NOTE] Use existing infra" 2 check_connection else - generate_ssh_key prepare_vms "${base_image}" "${STORAGE_DIR}" "${virtual_repos_pkgs}" \ "${virtual_nodes[@]}" create_networks "${OPNFV_BRIDGES[@]}" |