Standardising key addition

Debian based repo’s now fetch keys in a similar manner to Redhat based
ones, and both stable and dev keys have entries in vars.

diff --git a/roles/ceph-common/tasks/install_on_debian.yml b/roles/ceph-common/tasks/install_on_debian.yml
index 972210065ead4fac96ffa8c63fb20ebb25c36de3..721eb0fac29d97da98429e40baab1dbfcffd8957 100644 (file)
--- a/roles/ceph-common/tasks/install_on_debian.yml
+++ b/roles/ceph-common/tasks/install_on_debian.yml
@@ -12,13 +12,13 @@
 
 - name: Install the Ceph repository stable key
   apt_key: >
-    data="{{ lookup('file', 'cephstable.asc') }}"
+    url={{ ceph_stable_key }}
     state=present
   when: ceph_stable
 
 - name: Install the Ceph developement repository key
   apt_key: >
-    data="{{ lookup('file', 'cephdev.asc') }}"
+    url={{ ceph_dev_key }}
     state=present
   when: ceph_dev
 

diff --git a/roles/ceph-common/tasks/install_on_redhat.yml b/roles/ceph-common/tasks/install_on_redhat.yml
index f690f4cf68e082777318e3285e047bd23861cea9..f911af9b77da57de6dd5fe31e78b937a601a5ce8 100644 (file)
--- a/roles/ceph-common/tasks/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/install_on_redhat.yml
@@ -10,13 +10,13 @@
 
 - name: Install the Ceph stable repository key
   rpm_key: >
-    key={{ ceph_key }}
+    key={{ ceph_stable_key }}
     state=present
   when: ceph_stable
 
 - name: Install the Ceph developement repository key
   rpm_key: >
-    key={{ ceph_key }}
+    key={{ ceph_dev_key }}
     state=present
   when: ceph_dev
 

diff --git a/roles/ceph-common/vars/main.yml b/roles/ceph-common/vars/main.yml
index a27f63e869576760f12225cf5cb6a2a932eb0295..bebe14f1e6db893fe6417ecad81d8c9bdeab099a 100644 (file)
--- a/roles/ceph-common/vars/main.yml
+++ b/roles/ceph-common/vars/main.yml
@@ -8,8 +8,8 @@
 #fsid:\r
 \r
 ## Packages branch\r
-ceph_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc\r
 ceph_stable: true # use ceph stable branch\r
+ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc\r
 ceph_stable_release: giant # ceph stable release\r
 \r
 # This option is needed for _both_ stable and dev version, so please always fill the right version\r
@@ -17,6 +17,7 @@ ceph_stable_release: giant # ceph stable release
 ceph_stable_redhat_distro: el7\r
 \r
 ceph_dev: false # use ceph developement branch\r
+ceph_dev_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc\r
 ceph_dev_branch: master # developement branch you would like to use e.g: master, wip-hack\r
 # supported distros are centos6, centos7, fc17, fc18, fc19, fc20, fedora17, fedora18,\r
 # fedora19, fedora20, opensuse12, sles0. (see http://gitbuilder.ceph.com/).\r