From 9193e88878d97288638269f42ce39adb181f10ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 4 Oct 2017 13:36:01 +0200 Subject: [PATCH] common: fix rhcs installation on debian MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * 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 --- group_vars/all.yml.sample | 4 ++++ group_vars/rhcs.yml.sample | 4 ++++ .../prerequisite_rhcs_cdn_install_debian.yml | 12 +++--------- roles/ceph-defaults/defaults/main.yml | 4 ++++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 22110f879..51b615081 100644 --- 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 5ba40b7fc..58e7a872e 100644 --- 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 25aa6e004..98dd58bcc 100644 --- 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 20a31d3e7..3ac2d9be4 100644 --- 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 # -- 2.47.3