From: Matthew Rees <matthew.rees@secate.com>
Date: Tue, 11 Nov 2014 15:10:32 +0000 (+0200)
Subject: Standardising key addition
X-Git-Tag: v1.0.0~306^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6fcd37bc01fb55adbcd07f14bd7471fcb19675c;p=ceph-ansible.git

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