| commit | 007529620e9f8f456d25d676533ad96f1b71a12e | [log] [tgz] |
|---|---|---|
| author | Andy Bavier <andy@onlab.us> | Fri Aug 12 18:12:01 2016 -0400 |
| committer | Andy Bavier <andy@onlab.us> | Sat Aug 13 04:40:22 2016 -0700 |
| tree | 3e14aba65ba84b6f7da4d0ed30e9569fc2414e43 | |
| parent | d5a9cce3f44aa2694984afeb0c33a67172d59932 [diff] |
Fix node key issue Cleanup whitespace Fix node_key permissions Change-Id: I94c319a78230a145597680111fcfb2caf95814db
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 f2724cb..d258d54 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
@@ -44,10 +44,11 @@ - id_rsa - id_rsa.pub - - name: copy over SSH key as node_key + - name: copy over node_key copy: src={{ node_private_key }} dest={{ service_profile_repo_dest }}/{{ xos_configuration }}/node_key + owner={{ ansible_user_id }} mode=0600 - name: Download Glance VM images get_url:
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 cb96393..de7838e 100644 --- a/roles/xos-vm-install/templates/xos-setup-vars.yml.j2 +++ b/roles/xos-vm-install/templates/xos-setup-vars.yml.j2
@@ -15,8 +15,4 @@ 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 %} +node_private_key: "{{ ansible_user_dir }}/node_key"