| commit | 74cda483cc5152160c14a909cdefc67bfe114490 | [log] [tgz] |
|---|---|---|
| author | Dennis Dmitriev <ddmitriev@mirantis.com> | Fri Dec 14 13:01:32 2018 +0200 |
| committer | Dennis Dmitriev <ddmitriev@mirantis.com> | Fri Dec 14 14:03:44 2018 +0200 |
| tree | 0096ba68b023e742d0add3965ae8d373ef3aca1a | |
| parent | 24e1466faa0ef44a1278b285ad0600c857436490 [diff] |
Fix cookied-cicd-bm-os-contrail40-maas deploy - Increase cfg01 RAM from 8Gb to 16Gb - Pre-generate id_rsa.pub before bootstrapping machines Related-Bug: PROD-25848 Change-Id: I568f1b490ef49ab335230d3ff6316f7f47f0ef71
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: