Remove support of releases prior to Jewel.

According to #1216, we need to simply the code by removing the
support of anything before Jewel.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/handlers/main.yml b/handlers/main.yml
index c7dfb7647b64bfb6ff1233f2324b907b1a4be754..6a0a54c33fa8ded6b2543674c3ea13851c84d2c9 100644 (file)
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,123 +4,39 @@
     update-cache: yes
 
 - name: restart ceph mons
-  command: service ceph restart mon
-  when:
-    - socket.rc == 0
-    - ansible_distribution != 'Ubuntu'
-    - mon_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
-
-- name: restart ceph mons with systemd
   service:
       name: ceph-mon@{{ monitor_name }}
       state: restarted
   when:
     - socket.rc == 0
-    - use_systemd
-    - mon_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
-
-- name: restart ceph mons on ubuntu
-  command: initctl restart ceph-mon cluster={{ cluster }} id={{ monitor_name }}
-  when:
-    - socket.rc == 0
-    - ansible_distribution == 'Ubuntu'
-    - not use_systemd
     - mon_group_name in group_names
 
-- name: restart ceph osds
-  command: service ceph restart osd
-  when:
-    - socket.rc == 0
-    - ansible_distribution != 'Ubuntu'
-    - osd_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
-
 # This does not just restart OSDs but everything else too. Unfortunately
 # at this time the ansible role does not have an OSD id list to use
 # for restarting them specifically.
-- name: restart ceph osds with systemd
+- name: restart ceph osds
   service:
     name: ceph.target
     state: restarted
   when:
     - socket.rc == 0
-    - use_systemd
     - osd_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
-
-- name: restart ceph osds on ubuntu
-  shell: |
-    for id in $(ls /var/lib/ceph/osd/ |grep -oh '[0-9]*'); do
-      initctl restart ceph-osd cluster={{ cluster }} id=$id
-    done
-  when:
-    - socket.rc == 0
-    - ansible_distribution == 'Ubuntu'
-    - not use_systemd
-    - osd_group_name in group_names
-
-- name: restart ceph mdss on ubuntu
-  command: initctl restart ceph-mds cluster={{ cluster }} id={{ ansible_hostname }}
-  when:
-    - socket.rc == 0
-    - ansible_distribution == 'Ubuntu'
-    - not use_systemd
-    - mds_group_name in group_names
 
 - name: restart ceph mdss
-  command: service ceph restart mds
-  when:
-    - socket.rc == 0
-    - ansible_distribution != 'Ubuntu'
-    - use_systemd
-    - mds_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
-
-- name: restart ceph mdss with systemd
   service:
       name: ceph-mds@{{ mds_name }}
       state: restarted
   when:
     - socket.rc == 0
-    - use_systemd
     - mds_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
-
-- name: restart ceph rgws on ubuntu
-  command: initctl restart radosgw cluster={{ cluster }} id=rgw.{{ ansible_hostname }}
-  when:
-    - socketrgw.rc == 0
-    - ansible_distribution == 'Ubuntu'
-    - not use_systemd
-    - rgw_group_name in group_names
 
 - name: restart ceph rgws
-  command: /etc/init.d/radosgw restart
-  when:
-    - socketrgw.rc == 0
-    - ansible_distribution != 'Ubuntu'
-    - rgw_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
-
-- name: restart ceph rgws on red hat
-  command: /etc/init.d/ceph-radosgw restart
-  when:
-    - socketrgw.rc == 0
-    - ansible_os_family == 'RedHat'
-    - rgw_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
-
-- name: restart ceph rgws with systemd
   service:
     name: ceph-rgw@{{ ansible_hostname }}
     state: restarted
   when:
     - socketrgw.rc == 0
-    - use_systemd
     - rgw_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
 
 - name: restart ceph nfss
   service:

diff --git a/tasks/checks/check_system.yml b/tasks/checks/check_system.yml
index 21e348c9646c21312823ed6555f4f4065214bf15..e198e1f1863539091297302ae2b64accee465685 100644 (file)
--- a/tasks/checks/check_system.yml
+++ b/tasks/checks/check_system.yml
@@ -34,3 +34,8 @@
   when:
     - ansible_version.major|int == 1
     - ansible_version.minor|int < 9
+
+- name: fail if systemd is not present
+  fail:
+    msg: "Systemd must be present"
+  when: ansible_service_mgr != 'systemd'

diff --git a/tasks/facts.yml b/tasks/facts.yml
index 49a936ad38d2cc99107bca0d4aabf6ce6083df23..9709e38195cc6cbd3430babff8df97f50471d4dc 100644 (file)
--- a/tasks/facts.yml
+++ b/tasks/facts.yml
@@ -49,19 +49,6 @@
 - set_fact:
     ceph_version: "{{ ceph_version.stdout.split(' ')[2] }}"
 
-# NOTE(mattt): On ansible 2.x we can use ansible_service_mgr instead
-- name: check init system
-  slurp:
-    src: /proc/1/comm
-  always_run: yes
-  register: init_system
-
-- set_fact:
-    init_system={{ init_system.content | b64decode | trim }}
-
-- set_fact:
-    use_systemd={{ init_system.strip() == 'systemd' }}
-
 - set_fact:
     mds_name: "{{ ansible_hostname }}"
   when: not mds_use_fqdn
@@ -70,81 +57,21 @@
     mds_name: "{{ ansible_fqdn }}"
   when: mds_use_fqdn
 
-- set_fact:
-    dir_owner: ceph
-    dir_group: ceph
-    dir_mode: "0755"
-  when: ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
-
-- set_fact:
-    dir_owner: root
-    dir_group: root
-    dir_mode: "0755"
-  when: ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
-
-- set_fact:
-    key_owner: root
-    key_group: root
-    key_mode: "0600"
-  when: ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
-
-- set_fact:
-    key_owner: ceph
-    key_group: ceph
-    key_mode: "0600"
-  when: ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
-
-- set_fact:
-    activate_file_owner: ceph
-    activate_file_group: ceph
-    activate_file_mode: "0644"
-  when: ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
-
-- set_fact:
-    activate_file_owner: root
-    activate_file_group: root
-    activate_file_mode: "0644"
-  when: ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
-
-- set_fact:
-    rbd_client_directory_owner: root
-  when:
-    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
-    - rbd_client_directory_owner is not defined
-      or not rbd_client_directory_owner
-
 - set_fact:
     rbd_client_directory_owner: ceph
   when:
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
     - rbd_client_directory_owner is not defined
       or not rbd_client_directory_owner
 
-- set_fact:
-    rbd_client_directory_group: root
-  when:
-    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
-    - rbd_client_directory_group is not defined
-      or not rbd_client_directory_group
-
 - set_fact:
     rbd_client_directory_group: ceph
   when:
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
     - rbd_client_directory_group is not defined
       or not rbd_client_directory_group
 
-- set_fact:
-    rbd_client_directory_mode: "1777"
-  when:
-    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
-    - rbd_client_directory_mode is not defined
-      or not rbd_client_directory_mode
-
 - set_fact:
     rbd_client_directory_mode: "0770"
   when:
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
     - rbd_client_directory_mode is not defined
       or not rbd_client_directory_mode
 

diff --git a/tasks/generate_ceph_conf.yml b/tasks/generate_ceph_conf.yml
index 59fa03c17992cf1c39432093eb53a16e72ab93fc..9f54fb40ca84293dbc596eaaf70f75c2ca11af03 100644 (file)
--- a/tasks/generate_ceph_conf.yml
+++ b/tasks/generate_ceph_conf.yml
@@ -3,32 +3,22 @@
   file:
     path: /etc/ceph
     state: directory
-    owner: "{{ dir_owner }}"
-    group: "{{ dir_group }}"
-    mode: "{{ dir_mode }}"
+    owner: "ceph"
+    group: "ceph"
+    mode: "0755"
 
 - name: "generate ceph configuration file: {{ cluster }}.conf"
   action: config_template
   args:
     src: ceph.conf.j2
     dest: /etc/ceph/{{ cluster }}.conf
-    owner: "{{ dir_owner }}"
-    group: "{{ dir_group }}"
-    mode: "{{ activate_file_mode }}"
+    owner: "ceph"
+    group: "ceph"
+    mode: "0644"
     config_overrides: "{{ ceph_conf_overrides }}"
     config_type: ini
   notify:
     - restart ceph mons
-    - restart ceph mons on ubuntu
-    - restart ceph mons with systemd
     - restart ceph osds
-    - restart ceph osds on ubuntu
-    - restart ceph osds with systemd
     - restart ceph mdss
-    - restart ceph mdss on ubuntu
-    - restart ceph mdss with systemd
     - restart ceph rgws
-    - restart ceph rgws on ubuntu
-    - restart ceph rgws on red hat
-    - restart ceph rgws with systemd
-    - restart ceph nfss

diff --git a/tasks/installs/install_on_redhat.yml b/tasks/installs/install_on_redhat.yml
index 3769eaffa91b62dc45d9b09edae7781aa5905d9f..8df9ebca906e6d731adc19666487ea37e09c26f7 100644 (file)
--- a/tasks/installs/install_on_redhat.yml
+++ b/tasks/installs/install_on_redhat.yml
@@ -49,15 +49,6 @@
     - ceph_origin == 'local'
     - use_installer
 
-- name: install ceph
-  yum:
-    name: ceph
-    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when:
-    - ceph_release_num.{{ ceph_release }} <= ceph_release_num.infernalis
-    - ansible_pkg_mgr == "yum"
-    - ceph_origin != 'local'
-
 - name: synchronize ceph install
   synchronize:
     src: "{{ceph_installation_dir}}/"
@@ -83,7 +74,6 @@
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   when:
     - mon_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_custom
 
@@ -93,7 +83,6 @@
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   when:
     - osd_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_custom
 
@@ -103,7 +92,6 @@
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   when:
     - mds_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_custom
 
@@ -113,7 +101,6 @@
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   when:
     - client_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_dev
       or ceph_custom
@@ -124,7 +111,6 @@
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   when:
     - client_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_custom