diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index c1f8bb340..348698ff5 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -177,10 +177,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 7dca92f36..b0dea2e6b 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -177,10 +177,6 @@ ceph_rhcs_version: 5 #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 1a653b198..dd610f68c 100644 --- 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 index 200654317..000000000 --- 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 index b5fd732ca..000000000 --- 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 index af740c70e..000000000 --- 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 index 45abfbcae..000000000 --- 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 45249c75b..6e4570008 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -169,10 +169,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 b1be04b10..fe2b4ce11 100644 --- a/roles/ceph-validate/tasks/main.yml +++ b/roles/ceph-validate/tasks/main.yml @@ -96,15 +96,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'] # SUSE/openSUSE Leap only supports the following: # - ceph_origin == 'distro'