From: Sébastien Han <seb@redhat.com>
Date: Sun, 1 May 2016 14:22:43 +0000 (+0200)
Subject: ceph: use jewel release
X-Git-Tag: v1.0.6~135^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F748%2Fhead;p=ceph-ansible.git

ceph: use jewel release

Also fix the repo url.

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/group_vars/all.sample b/group_vars/all.sample
index fec0cfca8..e31710204 100644
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -82,8 +82,8 @@ dummy:
 # COMMUNITY VERSION
 #ceph_stable: false # use ceph stable branch
 #ceph_stable_key: https://download.ceph.com/keys/release.asc
-#ceph_stable_release: infernalis # ceph stable release
-#ceph_stable_repo: "http://ceph.com/debian-{{ ceph_stable_release }}"
+#ceph_stable_release: jewel # ceph stable release
+#ceph_stable_repo: "http://download.ceph.com/debian-{{ ceph_stable_release }}"
 
 ###################
 # Stable Releases #
@@ -97,12 +97,12 @@ dummy:
 #  - infernalis
 
 # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions
-# # for a list of available Debian distributions, visit http://ceph.com/debian-{{ ceph_stable_release }}/dists/
+# # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/
 # for more info read: https://github.com/ceph/ceph-ansible/issues/305
 #ceph_stable_distro_source:
 
 # This option is needed for _both_ stable and dev version, so please always fill the right version
-# # for supported distros, see http://ceph.com/rpm-{{ ceph_stable_release }}/
+# # for supported distros, see http://download.ceph.com/rpm-{{ ceph_stable_release }}/
 #ceph_stable_redhat_distro: el7
 
 # ENTERPRISE VERSION ICE (old, prior to the 1.3)
@@ -382,3 +382,4 @@ dummy:
 # by ceph.conf.j2 template. so it should always be defined
 #mon_containerized_deployment_with_kv: false
 
+
diff --git a/group_vars/common-coreoss.sample b/group_vars/common-coreoss.sample
index 32ae29553..071f0af9e 100644
--- a/group_vars/common-coreoss.sample
+++ b/group_vars/common-coreoss.sample
@@ -14,4 +14,3 @@ dummy:
 #pypy_binary_directory: /opt/bin
 #pip_url: https://bootstrap.pypa.io/get-pip.py
 #local_temp_directory: /tmp
-
diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 9252df151..0189d2683 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -74,8 +74,8 @@ ceph_use_distro_backports: false # DEBIAN ONLY
 # COMMUNITY VERSION
 ceph_stable: false # use ceph stable branch
 ceph_stable_key: https://download.ceph.com/keys/release.asc
-ceph_stable_release: infernalis # ceph stable release
-ceph_stable_repo: "http://ceph.com/debian-{{ ceph_stable_release }}"
+ceph_stable_release: jewel # ceph stable release
+ceph_stable_repo: "http://download.ceph.com/debian-{{ ceph_stable_release }}"
 
 ###################
 # Stable Releases #
@@ -89,12 +89,12 @@ ceph_stable_releases:
   - infernalis
 
 # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions
-# # for a list of available Debian distributions, visit http://ceph.com/debian-{{ ceph_stable_release }}/dists/
+# # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/
 # for more info read: https://github.com/ceph/ceph-ansible/issues/305
 #ceph_stable_distro_source:
 
 # This option is needed for _both_ stable and dev version, so please always fill the right version
-# # for supported distros, see http://ceph.com/rpm-{{ ceph_stable_release }}/
+# # for supported distros, see http://download.ceph.com/rpm-{{ ceph_stable_release }}/
 ceph_stable_redhat_distro: el7
 
 # ENTERPRISE VERSION ICE (old, prior to the 1.3)
diff --git a/roles/ceph-common/tasks/installs/redhat_ceph_repository.yml b/roles/ceph-common/tasks/installs/redhat_ceph_repository.yml
index bc4e906bd..b6469ffce 100644
--- a/roles/ceph-common/tasks/installs/redhat_ceph_repository.yml
+++ b/roles/ceph-common/tasks/installs/redhat_ceph_repository.yml
@@ -27,7 +27,7 @@
 
 - name: add ceph stable repository
   yum:
-    name: http://ceph.com/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/noarch/ceph-release-1-0.{{ ceph_stable_redhat_distro|replace('rhel', 'el') }}.noarch.rpm
+    name: http://download.ceph.com/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/noarch/ceph-release-1-0.{{ ceph_stable_redhat_distro|replace('rhel', 'el') }}.noarch.rpm
   changed_when: false
   when:
     ceph_stable and
@@ -35,7 +35,7 @@
 
 - name: add ceph stable repository
   dnf:
-    name: http://ceph.com/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/noarch/ceph-release-1-0.{{ ceph_stable_redhat_distro|replace('rhel', 'el') }}.noarch.rpm
+    name: http://download.ceph.com/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/noarch/ceph-release-1-0.{{ ceph_stable_redhat_distro|replace('rhel', 'el') }}.noarch.rpm
   changed_when: false
   when:
     ceph_stable and