openstack/openstack-ansible
Code Issues Proposed changes

Merge "Allow sourcing apt_key from URL"

Browse Source
This commit is contained in:
Jenkins
2016-01-27 16:31:36 +00:00
committed by Gerrit Code Review
parent 918be83c6e af30c978bd
commit 279288c785
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@
id: "{{ item.hash_id }}" id: "{{ item.hash_id }}"
keyserver: "{{ item.keyserver | default(omit) }}" keyserver: "{{ item.keyserver | default(omit) }}"
data: "{{ item.data | default(omit) }}" data: "{{ item.data | default(omit) }}"
url: "{{ item.url | default(omit) }}"
state: "present" state: "present"
register: add_keys register: add_keys
until: add_keys|success until: add_keys|success
@@ -40,14 +41,15 @@
- name: Add ceph apt-keys using fallback keyserver - name: Add ceph apt-keys using fallback keyserver
apt_key: apt_key:
id: "{{ item.hash_id }}" id: "{{ item.hash_id }}"
keyserver: "{{ item.fallback_keyserver }}" keyserver: "{{ item.fallback_keyserver | default(omit) }}"
url: "{{ item.fallback_url | default(omit) }}"
state: "present" state: "present"
register: add_keys_fallback register: add_keys_fallback
until: add_keys_fallback|success until: add_keys_fallback|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: ceph_gpg_keys with_items: ceph_gpg_keys
when: add_keys|failed and item.fallback_keyserver is defined when: add_keys|failed and (item.fallback_keyserver is defined or item.fallback_url is defined)
tags: tags:
- ceph-apt-keys - ceph-apt-keys

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

@@ -41,6 +41,7 @@
id: "{{ item.hash_id }}" id: "{{ item.hash_id }}"
keyserver: "{{ item.keyserver | default(omit) }}" keyserver: "{{ item.keyserver | default(omit) }}"
data: "{{ item.data | default(omit) }}" data: "{{ item.data | default(omit) }}"
url: "{{ item.url | default(omit) }}"
state: "present" state: "present"
register: add_keys register: add_keys
until: add_keys|success until: add_keys|success
@@ -54,14 +55,15 @@
- name: Add haproxy apt-keys using fallback keyserver - name: Add haproxy apt-keys using fallback keyserver
apt_key: apt_key:
id: "{{ item.hash_id }}" id: "{{ item.hash_id }}"
keyserver: "{{ item.fallback_keyserver }}" keyserver: "{{ item.fallback_keyserver | default(omit) }}"
url: "{{ item.fallback_url | default(omit) }}"
state: "present" state: "present"
register: add_keys_fallback register: add_keys_fallback
until: add_keys_fallback|success until: add_keys_fallback|success
retries: 5 retries: 5
delay: 2 delay: 2
with_items: haproxy_gpg_keys with_items: haproxy_gpg_keys
when: add_keys|failed and item.fallback_keyserver is defined when: add_keys|failed and (item.fallback_keyserver is defined or item.fallback_url is defined)
tags: tags:
- haproxy-apt-keys - haproxy-apt-keys