common: fix rhcs installation on debian

* Change version from 2 to 3.
* use ceph_rhcs_cdn_debian_repo_version to use other repositories along
* with ceph_rhcs_cdn_debian_repo

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

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 22110f879b4f5c16c40592d8b845b987808154df..51b61508135d8f5918d5089dae1affd6fc132cf0 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -178,6 +178,10 @@ dummy:
 #ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default('/tmp/rh-storage-mount') }}"
 #ceph_rhcs_repository_path: "{{ ceph_stable_rh_storage_repository_path | default('/tmp/rh-storage-repo') }}" # where to copy iso's content
 
+# RHCS installation in Debian systems
+#ceph_rhcs_cdn_debian_repo: https://customername:customerpasswd@rhcs.download.redhat.com
+#ceph_rhcs_cdn_debian_repo_version: "/3-updates/"
+
 
 # REPOSITORY: UBUNTU CLOUD ARCHIVE
 #

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 5ba40b7fc20512f151f0a7b1041bdd05fda1894c..58e7a872e4e58aa7bcd99b106a1276c04082e5ed 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -178,6 +178,10 @@ ceph_repository: rhcs
 #ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default('/tmp/rh-storage-mount') }}"
 #ceph_rhcs_repository_path: "{{ ceph_stable_rh_storage_repository_path | default('/tmp/rh-storage-repo') }}" # where to copy iso's content
 
+# RHCS installation in Debian systems
+#ceph_rhcs_cdn_debian_repo: https://customername:customerpasswd@rhcs.download.redhat.com
+#ceph_rhcs_cdn_debian_repo_version: "/3-updates/"
+
 
 # REPOSITORY: UBUNTU CLOUD ARCHIVE
 #

diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml
index 25aa6e00486ff7d7008f739998541a03d42722ae..98dd58bcc30686baf63bd955815568cc15f0d855 100644 (file)
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml
@@ -6,7 +6,7 @@
 
 - name: enable red hat storage monitor repository for debian systems
   apt_repository:
-    repo: "deb {{ ceph_rhcs_cdn_debian_repo }}/2-updates/MON {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main"
+    repo: "deb {{ ceph_rhcs_cdn_debian_repo }}{{ ceph_rhcs_cdn_debian_repo_version }}/MON {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main"
     state: present
   changed_when: false
   when:
@@ -14,7 +14,7 @@
 
 - name: enable red hat storage osd repository for debian systems
   apt_repository:
-    repo: "deb {{ ceph_rhcs_cdn_debian_repo }}/2-updates/OSD {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main"
+    repo: "deb {{ ceph_rhcs_cdn_debian_repo }}{{ ceph_rhcs_cdn_debian_repo_version }}/OSD {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main"
     state: present
   changed_when: false
   when:
@@ -22,14 +22,8 @@
 
 - name: enable red hat storage rados gateway / mds repository for debian systems
   apt_repository:
-    repo: "deb {{ ceph_rhcs_cdn_debian_repo }}/2-updates/Tools {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main"
+    repo: "deb {{ ceph_rhcs_cdn_debian_repo }}{{ ceph_rhcs_cdn_debian_repo_version }}/Tools {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main"
     state: present
   changed_when: false
   when:
     - (rgw_group_name in group_names or mds_group_name in group_names)
-
-- name: enable red hat storage agent repository for debian systems
-  apt_repository:
-    repo: "deb {{ ceph_rhcs_cdn_debian_repo }}/2-updates/Agent {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main"
-    state: present
-  changed_when: false

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 20a31d3e749a350a9076cecb7daa9b42ea6b583a..3ac2d9be48b1cce13bff3b8645749bb2f4010c87 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -170,6 +170,10 @@ ceph_rhcs_iso_path: "{{ ceph_stable_rh_storage_iso_path | default('') }}"
 ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default('/tmp/rh-storage-mount') }}"
 ceph_rhcs_repository_path: "{{ ceph_stable_rh_storage_repository_path | default('/tmp/rh-storage-repo') }}" # where to copy iso's content
 
+# RHCS installation in Debian systems
+ceph_rhcs_cdn_debian_repo: https://customername:customerpasswd@rhcs.download.redhat.com
+ceph_rhcs_cdn_debian_repo_version: "/3-updates/"
+
 
 # REPOSITORY: UBUNTU CLOUD ARCHIVE
 #