openstack/openstack-ansible
Code Issues Proposed changes

Allow sourcing apt_key from URL

Browse Source 
Allow deployers to specificy a remote URL to download apt signing
keys from.

Example:
galera_client_gpg_keys:
  - key_name: 'mariadb'
    url: "https://some.webserver.com/mariadb.gpg"
    fallback_url: "https://other.webserver.com/mariadb.gpg"
    hash_id: '0xcbcb082a1bb943db'
  - key_name: 'percona-xtrabackup'
    keyserver: 'hkp://keyserver.ubuntu.com:80'
    fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80'
    hash_id: '0x1c4cbdcdcd2efd2a'

Change-Id: I781cb8f5744c4e1e8e728a8ad308d135d2e5922c
This commit is contained in:
Logan V 2016-01-22 11:39:06 -06:00
parent 6b02df6ced
commit af30c978bd
2 changed files with 8 additions and 4 deletions
Show Stats 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