| commit | d39936c2ffbf609ad0107981400dc89f911baec7 | [log] [tgz] |
|---|---|---|
| author | Andy Bavier <andy@onlab.us> | Tue Aug 02 17:31:07 2016 -0400 |
| committer | Andy Bavier <andy@onlab.us> | Tue Aug 02 17:27:12 2016 -0700 |
| tree | 465db2e76c1c65b3b9fcfdc40b07d07f55fca1bd | |
| parent | 18a2a988fecb092b73187e1279f0eff30ef37d82 [diff] |
Use MaaS node key when on_maas Change-Id: Ie5708aac996647ee532d33a82ec5e9af468645a8 (cherry picked from commit 057a8833bb8f5627ed2c05a307ae4149f3131020)
diff --git a/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml b/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml index 8a99769..f2724cb 100644 --- a/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml +++ b/roles/xos-vm-install/files/xos-setup-cord-pod-playbook.yml
@@ -46,7 +46,7 @@ - name: copy over SSH key as node_key copy: - src=~/.ssh/id_rsa + src={{ node_private_key }} dest={{ service_profile_repo_dest }}/{{ xos_configuration }}/node_key - name: Download Glance VM images @@ -76,4 +76,3 @@ chdir="{{ xos_repo_dest }}/containers/xos/" with_items: - base -
diff --git a/roles/xos-vm-install/templates/xos-setup-vars.yml.j2 b/roles/xos-vm-install/templates/xos-setup-vars.yml.j2 index 9a0afbb..cb96393 100644 --- a/roles/xos-vm-install/templates/xos-setup-vars.yml.j2 +++ b/roles/xos-vm-install/templates/xos-setup-vars.yml.j2
@@ -14,3 +14,9 @@ service_profile_repo_url: "{{ service_profile_repo_url }}" service_profile_repo_dest: "{{ service_profile_repo_dest }}" service_profile_repo_branch: "{{ service_profile_repo_branch }}" + +{% if on_maas %} +node_private_key: "{{ maas_node_key }}" +{% else %} +node_private_key: "~/.ssh/id_rsa" +{% endif %}