Merge pull request #906 from ktdreyer/rm-ice

remove references to Inktank Ceph Storage

group_vars/all.sample

@@ -44,7 +44,7 @@ dummy:
 # is not needed for versions after infernalis.
 #use_server_package_split: true
 
-# /!\ EITHER ACTIVE ceph_stable OR ceph_stable_ice OR ceph_stable_uca OR ceph_dev OR ceph_custom /!\
+# /!\ EITHER ACTIVE ceph_stable OR ceph_stable_uca OR ceph_dev OR ceph_custom /!\
 
 #debian_package_dependencies:
 #  - python-pycurl
@@ -120,20 +120,6 @@ dummy:
 # # 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)
-#ceph_stable_ice: false # use Inktank Ceph Enterprise
-#ceph_stable_ice_url: https://download.inktank.com/enterprise
-# these two variables are used in `with_items` and starting
-# with ansible 2.0 these need to be defined even if the tasks's
-# `when` clause doesn't evaluate to true
-#ceph_stable_ice_temp_path: /opt/ICE/ceph-repo/
-#ceph_stable_ice_kmod: 3.10-0.1.20140702gitdc9ac62.el7.x86_64
-#ceph_stable_ice_distro: rhel7 # Please check the download website for the supported versions.
-#ceph_stable_ice_version: 1.2.2
-#ceph_stable_ice_kmod_version: 1.2
-#ceph_stable_ice_user: # htaccess user
-#ceph_stable_ice_password: # htaccess password
-
 # ENTERPRISE VERSION RED HAT STORAGE (from 1.3)
 # This version is only supported on RHEL >= 7.1
 # As of RHEL 7.1, libceph.ko and rbd.ko are now included in Red Hat's kernel

roles/ceph-common/README.md

@@ -25,7 +25,6 @@ Have a look at `defaults/main.yml`.
 * Install source, choose one of these:
   * `ceph_stable`
   * `ceph_dev`
-  * `ceph_stable_ice`
   * `ceph_stable_rh_storage`
   * `ceph_custom`
 * `journal_size`

roles/ceph-common/defaults/main.yml

@@ -36,7 +36,7 @@ upgrade_ceph_packages: False
 # is not needed for versions after infernalis.
 use_server_package_split: true
 
-# /!\ EITHER ACTIVE ceph_stable OR ceph_stable_ice OR ceph_stable_uca OR ceph_dev OR ceph_custom /!\
+# /!\ EITHER ACTIVE ceph_stable OR ceph_stable_uca OR ceph_dev OR ceph_custom /!\
 
 debian_package_dependencies:
   - python-pycurl
@@ -112,20 +112,6 @@ ceph_stable_releases:
 # # 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)
-ceph_stable_ice: false # use Inktank Ceph Enterprise
-#ceph_stable_ice_url: https://download.inktank.com/enterprise
-# these two variables are used in `with_items` and starting
-# with ansible 2.0 these need to be defined even if the tasks's
-# `when` clause doesn't evaluate to true
-ceph_stable_ice_temp_path: /opt/ICE/ceph-repo/
-ceph_stable_ice_kmod: 3.10-0.1.20140702gitdc9ac62.el7.x86_64
-#ceph_stable_ice_distro: rhel7 # Please check the download website for the supported versions.
-#ceph_stable_ice_version: 1.2.2
-#ceph_stable_ice_kmod_version: 1.2
-#ceph_stable_ice_user: # htaccess user
-#ceph_stable_ice_password: # htaccess password
-
 # ENTERPRISE VERSION RED HAT STORAGE (from 1.3)
 # This version is only supported on RHEL >= 7.1
 # As of RHEL 7.1, libceph.ko and rbd.ko are now included in Red Hat's kernel

roles/ceph-common/files/cephstableice.asc

@@ -1,51 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-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
-=0eqL
------END PGP PUBLIC KEY BLOCK-----

roles/ceph-common/tasks/checks/check_mandatory_vars.yml

@@ -15,7 +15,6 @@
     - ceph_origin == 'upstream'
     - not ceph_stable
     - not ceph_dev
-    - not ceph_stable_ice
     - not ceph_stable_rh_storage
     - not ceph_stable_uca
   tags:

roles/ceph-common/tasks/installs/debian_ceph_repository.yml

@@ -11,12 +11,6 @@
     state: present
   when: ceph_dev
 
-- name: install intank ceph enterprise repository key
-  apt_key:
-    data: "{{ lookup('file', role_path+'/files/cephstableice.asc') }}"
-    state: present
-  when: ceph_stable_ice
-
 - name: add ceph stable repository
   apt_repository:
     repo: "deb {{ ceph_stable_repo }} {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main"
@@ -31,13 +25,6 @@
   changed_when: false
   when: ceph_dev
 
-- name: add inktank ceph enterprise repository
-  apt_repository:
-    repo: "deb file://{{ ceph_stable_ice_temp_path }} {{ ansible_lsb.codename }} main"
-    state: present
-  changed_when: false
-  when: ceph_stable_ice
-
 - name: add ubuntu cloud archive key package
   apt:
     pkg: ubuntu-cloud-keyring

roles/ceph-common/tasks/installs/install_on_redhat.yml

@@ -157,26 +157,6 @@
     - ceph_test
     - ansible_pkg_mgr == "dnf"
 
-- name: install Inktank Ceph Enterprise RBD Kernel modules
-  yum:
-    name: "{{ item }}"
-  with_items:
-    - "{{ ceph_stable_ice_temp_path }}/kmod-libceph-{{ ceph_stable_ice_kmod }}.rpm"
-    - "{{ ceph_stable_ice_temp_path }}/kmod-rbd-{{ ceph_stable_ice_kmod }}.rpm"
-  when:
-    - ceph_stable_ice
-    - ansible_pkg_mgr == "yum"
-
-- name: install Inktank Ceph Enterprise RBD Kernel modules
-  dnf:
-    name: "{{ item }}"
-  with_items:
-    - "{{ ceph_stable_ice_temp_path }}/kmod-libceph-{{ ceph_stable_ice_kmod }}.rpm"
-    - "{{ ceph_stable_ice_temp_path }}/kmod-rbd-{{ ceph_stable_ice_kmod }}.rpm"
-  when:
-    - ceph_stable_ice
-    - ansible_pkg_mgr == "dnf"
-
 - name: install rados gateway
   yum:
     name: ceph-radosgw

roles/ceph-common/tasks/installs/redhat_ceph_repository.yml

@@ -11,12 +11,6 @@
     state: present
   when: ceph_dev
 
-- name: install inktank ceph enterprise repository key
-  rpm_key:
-    key: "{{ ceph_stable_ice_temp_path }}/release.asc"
-    state: present
-  when: ceph_stable_ice
-
 - name: add ceph stable repository
   yum:
     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
@@ -49,15 +43,6 @@
     - ceph_dev
     - ansible_pkg_mgr == "dnf"
 
-- name: add inktank ceph enterprise repository
-  template:
-    src: "{{ role_path }}/templates/redhat_ice_repo.j2"
-    dest: /etc/yum.repos.d/ice.repo
-    owner: root
-    group: root
-    mode: 0644
-  when: ceph_stable_ice
-
 - name: add custom repo
   get_url:
     url: "{{ ceph_custom_repo }}"

roles/ceph-common/tasks/main.yml

@@ -9,11 +9,6 @@
 - include: ./misc/system_tuning.yml
   when: osd_group_name in group_names
 
-- include: ./pre_requisites/prerequisite_ice.yml
-  when: ceph_stable_ice
-  tags:
-    - package-install
-
 - include: ./pre_requisites/prerequisite_rh_storage_iso_install.yml
   when:
     - ceph_stable_rh_storage

roles/ceph-common/tasks/pre_requisites/prerequisite_ice.yml

@@ -1,52 +0,0 @@
----
-- name: create ice package directory
-  file:
-    path: "{{ ceph_stable_ice_temp_path }}"
-    state: directory
-    owner: root
-    group: root
-    mode: 0644
-  when: ceph_stable_ice
-
-- name: get ice packages
-  get_url:
-    url_username: "{{ ceph_stable_ice_user }}"
-    url_password: "{{ ceph_stable_ice_password }}"
-    url: "{{ ceph_stable_ice_url }}/{{ ceph_stable_ice_version }}/ICE-{{ ceph_stable_ice_version }}-{{ ceph_stable_ice_distro }}.tar.gz"
-    dest: "{{ ceph_stable_ice_temp_path }}/ICE-{{ ceph_stable_ice_version }}-{{ ceph_stable_ice_distro }}.tar.gz"
-  when: ceph_stable_ice
-
-- name: get ice Kernel Modules
-  get_url:
-    url_username: "{{ ceph_stable_ice_user }}"
-    url_password: "{{ ceph_stable_ice_password }}"
-    url: "{{ ceph_stable_ice_url }}/{{ ceph_stable_ice_kmod_version }}/{{ item }}"
-    dest: "{{ ceph_stable_ice_temp_path }}"
-  with_items:
-    - kmod-libceph-{{ ceph_stable_ice_kmod }}.rpm
-    - kmod-rbd-{{ ceph_stable_ice_kmod }}.rpm
-  when:
-    - ceph_stable_ice
-    - ansible_os_family == 'RedHat'
-
-- name: stat extracted ice repo files
-  stat:
-    path: "{{ ceph_stable_ice_temp_path }}/ice_setup.py"
-  register: repo_exist
-  when: ceph_stable_ice
-
-- name: extract ice packages
-  shell: tar -xzf ICE-{{ ceph_stable_ice_version }}-{{ ceph_stable_ice_distro }}.tar.gz
-  args:
-    chdir: "{{ ceph_stable_ice_temp_path }}"
-  changed_when: false
-  when:
-    - ceph_stable_ice
-    - repo_exist.stat.exists == False
-
-- name: move ice extracted packages
-  shell: "mv {{ ceph_stable_ice_temp_path }}/ceph/*/* {{ ceph_stable_ice_temp_path }}"
-  changed_when: false
-  when:
-    - ceph_stable_ice
-    - repo_exist.stat.exists == False

roles/ceph-common/templates/redhat_ice_repo.j2

@@ -1,9 +0,0 @@
-# {{ ansible_managed }}
-[ice]
-name=Inktank Ceph Enterprise - local packages for Ceph
-baseurl=file://{{ ceph_stable_ice_temp_path }}
-enabled=1
-gpgcheck=1
-type=rpm-md
-priority=1
-gpgkey=file://{{ ceph_stable_ice_temp_path }}/release.asc