rhcs: drop debian support

Support for debian with RHCS has been dropped starting RHCS 4

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 4ac99223b2dff5cf264e1b1632bf89583bff3a25)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index f73b02f9f8f6ca65f3dce7fd2e7f066996d8cdd2..6add04391a08dbd99c272314e6cee3e7cd4509c2 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -175,10 +175,6 @@ 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-release/" # for GA, later for updates use /3-updates/
-
 
 # REPOSITORY: UBUNTU CLOUD ARCHIVE
 #

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 6f7de8d9c85dec2b16dfc313382c6354f9ec9de0..a62b885365e170593cbec4b15f6883bdb7b1c814 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -175,10 +175,6 @@ ceph_rhcs_version: 4
 #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-release/" # for GA, later for updates use /3-updates/
-
 
 # REPOSITORY: UBUNTU CLOUD ARCHIVE
 #

diff --git a/roles/ceph-common/tasks/installs/configure_debian_repository_installation.yml b/roles/ceph-common/tasks/installs/configure_debian_repository_installation.yml
index 1a653b1987769f3ed1348f1113860452ebf3e854..dd610f68c5690139e4f6f99217a88d2415f25132 100644 (file)
--- a/roles/ceph-common/tasks/installs/configure_debian_repository_installation.yml
+++ b/roles/ceph-common/tasks/installs/configure_debian_repository_installation.yml
@@ -3,10 +3,6 @@
   include_tasks: debian_community_repository.yml
   when: ceph_repository == 'community'
 
-- name: include debian_rhcs_repository.yml
-  include_tasks: debian_rhcs_repository.yml
-  when: ceph_repository == 'rhcs'
-
 - name: include debian_dev_repository.yml
   include_tasks: debian_dev_repository.yml
   when: ceph_repository == 'dev'

diff --git a/roles/ceph-common/tasks/installs/debian_rhcs_repository.yml b/roles/ceph-common/tasks/installs/debian_rhcs_repository.yml
deleted file mode 100644 (file)
index 2006543..0000000
--- a/roles/ceph-common/tasks/installs/debian_rhcs_repository.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- name: set apt pinning for red hat ceph storage
-  template:
-    src: "{{ role_path }}/templates/rhcs.pref.j2"
-    dest: /etc/apt/preferences.d/rhcs.pref
-    owner: root
-    group: root
-    mode: 0644
-
-- name: include prerequisite_rhcs_iso_install_debian.yml
-  include_tasks: prerequisite_rhcs_iso_install_debian.yml
-  when: ceph_repository_type == 'iso'
-
-- name: include prerequisite_rhcs_cdn_install_debian.yml
-  include_tasks: prerequisite_rhcs_cdn_install_debian.yml
-  when: ceph_repository_type == 'cdn'

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
deleted file mode 100644 (file)
index b5fd732..0000000
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: install red hat storage repository key for debian systems
-  apt_key:
-    data: "{{ lookup('file', role_path+'/files/cephstablerhcs.asc') }}"
-    state: present
-  register: result
-  until: result is succeeded
-
-- name: enable red hat storage monitor repository for debian systems
-  apt_repository:
-    repo: "deb {{ ceph_rhcs_cdn_debian_repo }}{{ ceph_rhcs_cdn_debian_repo_version }}/{{ item.repo }} {{ ceph_stable_distro_source | default(ansible_distribution_release) }} main"
-    state: present
-    update_cache: yes
-  with_items:
-    - { repo: "MON", configure: (mon_group_name in group_names or mgr_group_name in group_names) }
-    - { repo: "OSD", configure: (osd_group_name in group_names) }
-    - { repo: "Tools", configure: (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names or iscsi_gw_group_name in group_names or client_group_name in group_names) }
-  when: item.configure

diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install_debian.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install_debian.yml
deleted file mode 100644 (file)
index af740c7..0000000
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install_debian.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-- name: create red hat storage package directories for debian systems
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ ceph_rhcs_mount_path }}"
-    - "{{ ceph_rhcs_repository_path }}"
-
-- name: ensure destination iso directory exists for debian systems
-  file:
-    path: "{{ ceph_rhcs_iso_path | dirname }}"
-    state: directory
-    recurse: yes
-  when: ceph_rhcs_iso_path | dirname != '/'
-
-- name: fetch the red hat storage iso from the ansible server for debian systems
-  copy:
-    src: "{{ ceph_rhcs_iso_path }}"
-    dest: "{{ ceph_rhcs_iso_path }}"
-
-# assumption: ceph_rhcs_mount_path does not specify directory
-
-- name: mount red hat storage iso file for debian systems
-  mount:
-    name: "{{ ceph_rhcs_mount_path }}"
-    src: "{{ ceph_rhcs_iso_path }}"
-    fstype: iso9660
-    opts: ro,loop,noauto
-    passno: 2
-    state: mounted
-
-- name: copy red hat storage iso content for debian systems
-  shell: cp -r {{ ceph_rhcs_mount_path }}/* {{ ceph_rhcs_repository_path }}
-  args:
-    creates: "{{ ceph_rhcs_repository_path }}/README"
-
-- name: unmount red hat storage iso file
-  mount:
-    name: "{{ ceph_rhcs_mount_path }}"
-    src: "{{ ceph_rhcs_iso_path }}"
-    fstype: iso9660
-    state: unmounted
-
-- name: install red hat storage repository key for debian systems
-  apt_key:
-    file: "{{ ceph_rhcs_repository_path }}/MON/release.asc"
-    state: present
-  register: result
-  until: result is succeeded
-
-- name: add red hat storage repository for debian systems
-  apt_repository:
-    repo: "deb file://{{ ceph_rhcs_repository_path }}/{{ item }} {{ ansible_distribution_release }} main"
-    state: present
-    update_cache: yes
-  with_items:
-    - MON
-    - OSD
-    - Tools

diff --git a/roles/ceph-common/templates/rhcs.pref.j2 b/roles/ceph-common/templates/rhcs.pref.j2
deleted file mode 100644 (file)
index 45abfbc..0000000
--- a/roles/ceph-common/templates/rhcs.pref.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-#jinja2: trim_blocks: "true", lstrip_blocks: "true"
-# {{ ansible_managed }}
-
-Explanation: Prefer Red Hat packages
-Package: *
-Pin: release o=/Red Hat/
-Pin-Priority: 999

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 9bfbcbd5add81ae75f5eeb2fc171d7e71963724d..68f2071a62ec01af7b9186938247ffe8af625560 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -167,10 +167,6 @@ 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-release/" # for GA, later for updates use /3-updates/
-
 
 # REPOSITORY: UBUNTU CLOUD ARCHIVE
 #

diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml
index 8424eb562ebc5f7e01088d55eb82fd70baa01a6b..a2c77049bf166a0d8a4d4f163ad672fde0b20ae9 100644 (file)
--- a/roles/ceph-validate/tasks/main.yml
+++ b/roles/ceph-validate/tasks/main.yml
@@ -103,15 +103,13 @@
       fail:
         msg: "'local' installation scenario not supported on Debian systems"
       when: ceph_origin == 'local'
-    - name: verify that ceph_rhcs_cdn_debian_repo url is valid for red hat storage
+
+    - name: fail if rhcs repository is enabled on debian
       fail:
-        msg: "ceph_rhcs_cdn_debian_repo url is invalid, please set your customername:customerpasswd"
+        msg: "RHCS isn't supported anymore on Debian distribution"
       when:
         - ceph_origin == 'repository'
         - ceph_repository == 'rhcs'
-        - ceph_repository_type == 'cdn'
-        - ceph_rhcs_cdn_debian_repo == 'https://customername:customerpasswd@rhcs.download.redhat.com'
-        - ceph_repository not in ['rhcs', 'dev', 'obs']
 
 - name: validate ntp daemon type
   fail: