| commit | f417072bf64261a4b0e8170fcd13aac691f63564 | [log] [tgz] |
|---|---|---|
| author | Dennis Dmitriev <dis.xcom@gmail.com> | Fri Dec 14 17:22:23 2018 +0000 |
| committer | Gerrit Code Review <support@gerrithub.io> | Fri Dec 14 17:22:23 2018 +0000 |
| tree | 393d8e2e9857b1f7dd6043ce5c1c64a61b66ba3b | |
| parent | 06d72731f668491c4aecbfb99dc57ae5d48c6b52 [diff] | |
| parent | 74cda483cc5152160c14a909cdefc67bfe114490 [diff] |
Merge "Fix cookied-cicd-bm-os-contrail40-maas deploy"
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt.yaml index 008dba0..9a571ba 100644 --- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt.yaml +++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt.yaml
@@ -27,6 +27,14 @@ retry: {count: 2, delay: 5} skip_fail: false +- description: Generate a public key for machines in MAAS + cmd: | + ssh-keygen -y -f ~root/.ssh/id_rsa > ~root/.ssh/id_rsa.pub + maas mirantis sshkeys create key="$(cat ~root/.ssh/id_rsa.pub)" + node_name: {{ HOSTNAME_CFG01 }} + retry: {count: 1, delay: 5} + skip_fail: false + - description: Run comissioning of BM nodes cmd: | salt-call maas.process_machines
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/underlay.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/underlay.yaml index 6371014..e48b817 100644 --- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/underlay.yaml +++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/underlay.yaml
@@ -98,7 +98,7 @@ role: salt_master params: vcpu: !os_env SLAVE_NODE_CPU, 4 - memory: !os_env SLAVE_NODE_MEMORY, 8192 + memory: !os_env SLAVE_NODE_MEMORY, 16384 boot: - hd volumes: