Changed URL for Ceph release and developer GPG keys, because previous key URL suffers...

diff --git a/group_vars/all.sample b/group_vars/all.sample
index 1e0f9f11d186b29fa9d0cdf3e856fb276aa79dcd..dbda68c665992e7d01fddcb975dd7e8852dae905 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -44,7 +44,7 @@ dummy:
 
 # COMMUNITY VERSION
 #ceph_stable: false # use ceph stable branch
-#ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
+#ceph_stable_key: https://download.ceph.com/keys/release.asc
 #ceph_stable_release: hammer # ceph stable release
 
 # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions
@@ -90,7 +90,7 @@ dummy:
 # ###
 
 #ceph_dev: false # use ceph development branch
-#ceph_dev_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc
+#ceph_dev_key: https://download.ceph.com/keys/autobuild.asc
 #ceph_dev_branch: master # development branch you would like to use e.g: master, wip-hack
 
 # supported distros are centos6, centos7, fc17, fc18, fc19, fc20, fedora17, fedora18,

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 04d453c5bc3fc15f724a8afb2713799ce5ddc3a1..c34a3ce38240b648bca248dc4e89de6147a85a34 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -42,7 +42,7 @@ ceph_use_distro_backports: false # DEBIAN ONLY
 \r
 # COMMUNITY VERSION\r
 ceph_stable: false # 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_key: https://download.ceph.com/keys/release.asc\r
 ceph_stable_release: hammer # ceph stable release\r
 \r
 # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions\r
@@ -88,7 +88,7 @@ ceph_stable_rh_storage_repository_path: /tmp/rh-storage-repo # where to copy iso
 # ###\r
 \r
 ceph_dev: false # use ceph development branch\r
-ceph_dev_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc\r
+ceph_dev_key: https://download.ceph.com/keys/autobuild.asc\r
 ceph_dev_branch: master # development branch you would like to use e.g: master, wip-hack\r
 \r
 # supported distros are centos6, centos7, fc17, fc18, fc19, fc20, fedora17, fedora18,\r

diff --git a/roles/ceph-common/templates/ceph-extra.repo b/roles/ceph-common/templates/ceph-extra.repo
index 84a863b7fcf6690330a467c59005aa7f14914369..dc2d27521bc2a164c4262258d5341db0311b5c66 100644 (file)
--- a/roles/ceph-common/templates/ceph-extra.repo
+++ b/roles/ceph-common/templates/ceph-extra.repo
@@ -7,7 +7,7 @@ enabled=1
 priority=2
 gpgcheck=1
 type=rpm-md
-gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
+gpgkey=https://download.ceph.com/keys/release.asc
 
 {% if (redhat_distro_ceph_extra != "centos6.4" and redhat_distro_ceph_extra !=  "rhel6.4" and redhat_distro_ceph_extra !=  "rhel6.5") %}
 [ceph-extras-noarch]
@@ -17,7 +17,7 @@ enabled=1
 priority=2
 gpgcheck=1
 type=rpm-md
-gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
+gpgkey=https://download.ceph.com/keys/release.asc
 {% endif %}
 
 [ceph-extras-source]
@@ -27,4 +27,4 @@ enabled=1
 priority=2
 gpgcheck=1
 type=rpm-md
-gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
+gpgkey=https://download.ceph.com/keys/release.asc