openstack/openstack-ansible
Code Issues Proposed changes

Merge "Allow sourcing apt_key from ansible host"

Browse Source
This commit is contained in:
Jenkins
2016-01-15 17:21:09 +00:00
committed by Gerrit Code Review
parent 22218a8455 41241e9691
commit b3d6ff2d14
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/roles/ceph_client/tasks/ceph_preinstall.yml
View File

@@ -25,7 +25,8 @@
- name: Add ceph apt-keys - name: Add ceph apt-keys
apt_key: apt_key:
id: "{{ item.hash_id }}" id: "{{ item.hash_id }}"
keyserver: "{{ item.keyserver }}" keyserver: "{{ item.keyserver | default(omit) }}"
data: "{{ item.data | default(omit) }}"
state: "present" state: "present"
register: add_keys register: add_keys
until: add_keys|success until: add_keys|success

3
playbooks/roles/haproxy_server/tasks/haproxy_add_ppa_repo.yml
View File

@@ -39,7 +39,8 @@
- name: Add haproxy apt-keys - name: Add haproxy apt-keys
apt_key: apt_key:
id: "{{ item.hash_id }}" id: "{{ item.hash_id }}"
keyserver: "{{ item.keyserver }}" keyserver: "{{ item.keyserver | default(omit) }}"
data: "{{ item.data | default(omit) }}"
state: "present" state: "present"
register: add_keys register: add_keys
until: add_keys|success until: add_keys|success