Merge "Use slurp to collect the keystone ssh keys"

This commit is contained in:
Jenkins 2016-01-26 04:22:50 +00:00 committed by Gerrit Code Review
commit 17e41c346b
2 changed files with 4 additions and 4 deletions

View File

@ -16,7 +16,7 @@
- name: Create authorized keys file from host vars - name: Create authorized keys file from host vars
authorized_key: authorized_key:
user: "{{ keystone_system_user_name }}" user: "{{ keystone_system_user_name }}"
key: "{{ hostvars[item]['keystone_pubkey'] }}" key: "{{ hostvars[item]['keystone_pubkey'] | b64decode }}"
with_items: groups['keystone_all'] with_items: groups['keystone_all']
tags: tags:
- keystone-key - keystone-key

View File

@ -14,8 +14,8 @@
# limitations under the License. # limitations under the License.
- name: Get public key contents and store as var - name: Get public key contents and store as var
command: | slurp:
cat {{ keystone_system_user_home }}/.ssh/id_rsa.pub src: "{{ keystone_system_user_home }}/.ssh/id_rsa.pub"
register: keystone_pub register: keystone_pub
changed_when: false changed_when: false
tags: tags:
@ -24,7 +24,7 @@
- name: Register a fact for the keystone pub key - name: Register a fact for the keystone pub key
set_fact: set_fact:
keystone_pubkey: "{{ keystone_pub.stdout }}" keystone_pubkey: "{{ keystone_pub.content }}"
tags: tags:
- keystone-key - keystone-key
- keystone-key-create - keystone-key-create