ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #953 from jsaintrocc/hammerfix 

Fixes for Hammer install and added numerical release checks
pull/1004/head
Leseb 2016-10-04 11:34:26 +02:00 committed by GitHub
parent 898fed7627 9c7dac6b94
commit 4bf7e8355a
21 changed files with 140 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -179,8 +179,6 @@ information about how to generate appropriate values for these variables.
By default, ceph-common installs from Ceph repository. However, you By default, ceph-common installs from Ceph repository. However, you
can set `ceph_origin` to "distro" to install Ceph from your default repository. can set `ceph_origin` to "distro" to install Ceph from your default repository.
Moreover for people looking to install any version of Ceph prior to the Jewel release on a Red Hat based system you would have to set `use_server_package_split: false`.
## Setup for Vagrant using libvirt provider ## Setup for Vagrant using libvirt provider
* Create vagrant_variables.yml * Create vagrant_variables.yml

15
group_vars/all.sample
View File

@ -41,10 +41,6 @@ dummy:
# "state=latest". # "state=latest".
#upgrade_ceph_packages: False #upgrade_ceph_packages: False
# If this is false then the 'ceph' package will be installed on rpm systems, which
# is not needed for versions after infernalis.
#use_server_package_split: true
# /!\ EITHER ACTIVE ceph_stable 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: #debian_package_dependencies:
@ -113,17 +109,6 @@ dummy:
#ceph_stable_release: jewel # ceph stable release #ceph_stable_release: jewel # ceph stable release
#ceph_stable_repo: "http://download.ceph.com/debian-{{ ceph_stable_release }}" #ceph_stable_repo: "http://download.ceph.com/debian-{{ ceph_stable_release }}"
###################
# Stable Releases #
###################
#ceph_stable_releases:
# - dumpling
# - emperor
# - firefly
# - giant
# - hammer
# - infernalis
# Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions
# # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/ # # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/
# for more info read: https://github.com/ceph/ceph-ansible/issues/305 # for more info read: https://github.com/ceph/ceph-ansible/issues/305

4
infrastructure-playbooks/purge-cluster.yml
View File

@ -86,7 +86,8 @@
ignore_errors: true ignore_errors: true
- name: wait for server to boot - name: wait for server to boot
local_action: wait_for port=22 host={{ inventory_hostname }} state=started delay=10 timeout=400 become: false
local_action: wait_for port=22 host={{ inventory_hostname }} state=started delay=10 timeout=500
- name: remove data - name: remove data
file: file:
@ -310,6 +311,7 @@
- name: is reboot needed - name: is reboot needed
local_action: shell echo requesting reboot local_action: shell echo requesting reboot
become: false
notify: notify:
- restart machine - restart machine
- wait for server to boot - wait for server to boot

26
roles/ceph-common/defaults/main.yml
View File

@ -33,10 +33,6 @@ check_firewall: False
# "state=latest". # "state=latest".
upgrade_ceph_packages: False upgrade_ceph_packages: False
# If this is false then the 'ceph' package will be installed on rpm systems, which
# is not needed for versions after infernalis.
use_server_package_split: true
# /!\ EITHER ACTIVE ceph_stable 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: debian_package_dependencies:
@ -105,16 +101,18 @@ ceph_stable_key: https://download.ceph.com/keys/release.asc
ceph_stable_release: jewel # ceph stable release ceph_stable_release: jewel # ceph stable release
ceph_stable_repo: "http://download.ceph.com/debian-{{ ceph_stable_release }}" ceph_stable_repo: "http://download.ceph.com/debian-{{ ceph_stable_release }}"
################### ######################################
# Stable Releases # # Releases name to number dictionary #
################### ######################################
ceph_stable_releases: ceph_release_num:
- dumpling dumpling: 0.67
- emperor emperor: 0.72
- firefly firefly: 0.80
- giant giant: 0.87
- hammer hammer: 0.94
- infernalis infernalis: 9
jewel: 10
kraken: 11
# Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions
# # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/ # # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/

18
roles/ceph-common/handlers/main.yml
View File

@ -9,7 +9,7 @@
- socket.rc == 0 - socket.rc == 0
- ansible_distribution != 'Ubuntu' - ansible_distribution != 'Ubuntu'
- mon_group_name in group_names - mon_group_name in group_names
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- name: restart ceph mons with systemd - name: restart ceph mons with systemd
service: service:
@ -19,7 +19,7 @@
- socket.rc == 0 - socket.rc == 0
- use_systemd - use_systemd
- mon_group_name in group_names - mon_group_name in group_names
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: restart ceph mons on ubuntu - name: restart ceph mons on ubuntu
command: initctl restart ceph-mon cluster={{ cluster }} id={{ monitor_name }} command: initctl restart ceph-mon cluster={{ cluster }} id={{ monitor_name }}
@ -35,7 +35,7 @@
- socket.rc == 0 - socket.rc == 0
- ansible_distribution != 'Ubuntu' - ansible_distribution != 'Ubuntu'
- osd_group_name in group_names - osd_group_name in group_names
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
# This does not just restart OSDs but everything else too. Unfortunately # 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 # at this time the ansible role does not have an OSD id list to use
@ -48,7 +48,7 @@
- socket.rc == 0 - socket.rc == 0
- use_systemd - use_systemd
- osd_group_name in group_names - osd_group_name in group_names
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: restart ceph osds on ubuntu - name: restart ceph osds on ubuntu
shell: | shell: |
@ -76,7 +76,7 @@
- ansible_distribution != 'Ubuntu' - ansible_distribution != 'Ubuntu'
- use_systemd - use_systemd
- mds_group_name in group_names - mds_group_name in group_names
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- name: restart ceph mdss with systemd - name: restart ceph mdss with systemd
service: service:
@ -86,7 +86,7 @@
- socket.rc == 0 - socket.rc == 0
- use_systemd - use_systemd
- mds_group_name in group_names - mds_group_name in group_names
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: restart ceph rgws on ubuntu - name: restart ceph rgws on ubuntu
command: initctl restart radosgw cluster={{ cluster }} id=rgw.{{ ansible_hostname }} command: initctl restart radosgw cluster={{ cluster }} id=rgw.{{ ansible_hostname }}
@ -102,7 +102,7 @@
- socketrgw.rc == 0 - socketrgw.rc == 0
- ansible_distribution != 'Ubuntu' - ansible_distribution != 'Ubuntu'
- rgw_group_name in group_names - rgw_group_name in group_names
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- name: restart ceph rgws on red hat - name: restart ceph rgws on red hat
command: /etc/init.d/ceph-radosgw restart command: /etc/init.d/ceph-radosgw restart
@ -110,7 +110,7 @@
- socketrgw.rc == 0 - socketrgw.rc == 0
- ansible_os_family == 'RedHat' - ansible_os_family == 'RedHat'
- rgw_group_name in group_names - rgw_group_name in group_names
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- name: restart ceph rgws with systemd - name: restart ceph rgws with systemd
service: service:
@ -120,7 +120,7 @@
- socketrgw.rc == 0 - socketrgw.rc == 0
- use_systemd - use_systemd
- rgw_group_name in group_names - rgw_group_name in group_names
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: restart apache2 - name: restart apache2
service: service:

42
roles/ceph-common/tasks/facts.yml
View File

@ -21,48 +21,6 @@
- set_fact: - set_fact:
use_systemd={{ init_system.strip() == 'systemd' }} use_systemd={{ init_system.strip() == 'systemd' }}
# NOTE (leseb/jsaintrocc): You are supposed to quote variables
# that follow colons to avoid confusion with dicts but this
# causes issues with the boolean, so we keep this syntax styling...
# is_before facts
- set_fact:
is_before_hammer={{ ceph_version | version_compare('0.94.0', '<') }}
- set_fact:
is_before_infernalis={{ ceph_version | version_compare('9.0.0', '<') }}
- set_fact:
is_before_jewel={{ ceph_version | version_compare('10.0.0', '<') }}
- set_fact:
is_before_kraken={{ ceph_version | version_compare('11.0.0', '<') }}
# is_after facts
- set_fact:
is_after_hammer={{ ceph_version | version_compare('0.95.0', '>') }}
- set_fact:
is_after_infernalis={{ ceph_version | version_compare('9.4.0', '>') }}
- set_fact:
is_after_jewel={{ ceph_version | version_compare('10.4.0', '>') }}
- set_fact:
is_after_kraken={{ ceph_version | version_compare('11.4.0', '>') }}
# is_version facts
- set_fact:
is_hammer={{ ceph_version | version_compare('0.94.0', '>=') | version_compare('9.0.0', '<') }}
- set_fact:
is_infernalis={{ ceph_version | version_compare('9.0.0', '>=') and ceph_version | version_compare('10.0.0', '<') }}
- set_fact:
is_jewel={{ ceph_version | version_compare('10.0.0', '>=') and ceph_version | version_compare('11.0.0', '<') }}
- set_fact:
is_kraken={{ ceph_version | version_compare('11.0.0', '>=') and ceph_version | version_compare('12.0.0', '<') }}
- set_fact: - set_fact:
mds_name: "{{ ansible_hostname }}" mds_name: "{{ ansible_hostname }}"
when: not mds_use_fqdn when: not mds_use_fqdn

42
roles/ceph-common/tasks/installs/install_on_redhat.yml
View File

@ -3,7 +3,7 @@
yum: yum:
name: "{{ item }}" name: "{{ item }}"
state: present state: present
with_items: redhat_package_dependencies with_items: "{{ redhat_package_dependencies }}"
when: when:
- ansible_distribution == "RedHat" - ansible_distribution == "RedHat"
- ansible_pkg_mgr == "yum" - ansible_pkg_mgr == "yum"
@ -12,7 +12,7 @@
dnf: dnf:
name: "{{ item }}" name: "{{ item }}"
state: present state: present
with_items: redhat_package_dependencies with_items: "{{ redhat_package_dependencies }}"
when: when:
- ansible_distribution == "RedHat" - ansible_distribution == "RedHat"
- ansible_pkg_mgr == "dnf" - ansible_pkg_mgr == "dnf"
@ -21,7 +21,7 @@
yum: yum:
name: "{{ item }}" name: "{{ item }}"
state: present state: present
with_items: centos_package_dependencies with_items: "{{ centos_package_dependencies }}"
when: when:
- ansible_distribution == "CentOS" - ansible_distribution == "CentOS"
- ansible_pkg_mgr == "yum" - ansible_pkg_mgr == "yum"
@ -30,7 +30,7 @@
dnf: dnf:
name: "{{ item }}" name: "{{ item }}"
state: present state: present
with_items: centos_package_dependencies with_items: "{{ centos_package_dependencies }}"
when: when:
- ansible_distribution == "CentOS" - ansible_distribution == "CentOS"
- ansible_pkg_mgr == "dnf" - ansible_pkg_mgr == "dnf"
@ -58,7 +58,7 @@
copy: copy:
src: "{{ansible_dir}}/rundep" src: "{{ansible_dir}}/rundep"
dest: "{{ item }}" dest: "{{ item }}"
with_items: rundep_location.stdout_lines with_items: "{{ rundep_location }}.stdout_lines"
when: when:
- ceph_origin == 'local' - ceph_origin == 'local'
- use_installer - use_installer
@ -66,7 +66,7 @@
- name: install ceph dependencies - name: install ceph dependencies
script: "{{ ansible_dir }}/rundep_installer.sh {{ item }}" script: "{{ ansible_dir }}/rundep_installer.sh {{ item }}"
become: true become: true
with_items: rundep_location.stdout_lines with_items: "{{ rundep_location }}.stdout_lines"
when: when:
- ceph_origin == 'local' - ceph_origin == 'local'
- use_installer - use_installer
@ -76,7 +76,7 @@
name: ceph name: ceph
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: when:
- not use_server_package_split - ceph_release_num.{{ ceph_release }} <= ceph_release_num.infernalis
- ansible_pkg_mgr == "yum" - ansible_pkg_mgr == "yum"
- ceph_origin != 'local' - ceph_origin != 'local'
@ -106,8 +106,7 @@
when: when:
- mon_group_name in group_names - mon_group_name in group_names
- ansible_pkg_mgr == "yum" - ansible_pkg_mgr == "yum"
- (ceph_stable and ceph_stable_release not in ceph_stable_releases) - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
or ceph_dev
or ceph_origin == "distro" or ceph_origin == "distro"
or ceph_custom or ceph_custom
@ -118,9 +117,8 @@
when: when:
- mon_group_name in group_names - mon_group_name in group_names
- ansible_pkg_mgr == "dnf" - ansible_pkg_mgr == "dnf"
- (ceph_stable and ceph_stable_release not in ceph_stable_releases) - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
or ceph_origin == "distro" or ceph_origin == "distro"
or ceph_dev
or ceph_custom or ceph_custom
- name: install distro or red hat storage ceph osd via yum - name: install distro or red hat storage ceph osd via yum
@ -130,9 +128,8 @@
when: when:
- osd_group_name in group_names - osd_group_name in group_names
- ansible_pkg_mgr == "yum" - ansible_pkg_mgr == "yum"
- (ceph_stable and ceph_stable_release not in ceph_stable_releases) - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
or ceph_origin == "distro" or ceph_origin == "distro"
or ceph_dev
or ceph_custom or ceph_custom
- name: install distro or red hat storage ceph osd via dnf - name: install distro or red hat storage ceph osd via dnf
@ -142,9 +139,8 @@
when: when:
- osd_group_name in group_names - osd_group_name in group_names
- ansible_pkg_mgr == "dnf" - ansible_pkg_mgr == "dnf"
- (ceph_stable and ceph_stable_release not in ceph_stable_releases) - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
or ceph_origin == "distro" or ceph_origin == "distro"
or ceph_dev
or ceph_custom or ceph_custom
- name: install distro or red hat storage ceph mds via yum - name: install distro or red hat storage ceph mds via yum
@ -154,9 +150,8 @@
when: when:
- mds_group_name in group_names - mds_group_name in group_names
- ansible_pkg_mgr == "yum" - ansible_pkg_mgr == "yum"
- (ceph_stable and ceph_stable_release not in ceph_stable_releases) - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
or ceph_origin == "distro" or ceph_origin == "distro"
or ceph_dev
or ceph_custom or ceph_custom
- name: install distro or red hat storage ceph mds via dnf - name: install distro or red hat storage ceph mds via dnf
@ -166,9 +161,8 @@
when: when:
- mds_group_name in group_names - mds_group_name in group_names
- ansible_pkg_mgr == "dnf" - ansible_pkg_mgr == "dnf"
- (ceph_stable and ceph_stable_release not in ceph_stable_releases) - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
or ceph_origin == "distro" or ceph_origin == "distro"
or ceph_dev
or ceph_custom or ceph_custom
- name: install distro or red hat storage ceph-fuse via yum - name: install distro or red hat storage ceph-fuse via yum
@ -178,7 +172,7 @@
when: when:
- client_group_name in group_names - client_group_name in group_names
- ansible_pkg_mgr == "yum" - ansible_pkg_mgr == "yum"
- (ceph_stable and ceph_stable_release not in ceph_stable_releases) - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
or ceph_origin == "distro" or ceph_origin == "distro"
or ceph_dev or ceph_dev
or ceph_custom or ceph_custom
@ -190,7 +184,7 @@
when: when:
- client_group_name in group_names - client_group_name in group_names
- ansible_pkg_mgr == "dnf" - ansible_pkg_mgr == "dnf"
- (ceph_stable and ceph_stable_release not in ceph_stable_releases) - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
or ceph_origin == "distro" or ceph_origin == "distro"
or ceph_dev or ceph_dev
or ceph_custom or ceph_custom
@ -202,9 +196,8 @@
when: when:
- client_group_name in group_names - client_group_name in group_names
- ansible_pkg_mgr == "yum" - ansible_pkg_mgr == "yum"
- (ceph_stable and ceph_stable_release not in ceph_stable_releases) - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
or ceph_origin == "distro" or ceph_origin == "distro"
or ceph_dev
or ceph_custom or ceph_custom
- name: install distro or red hat storage ceph base via dnf - name: install distro or red hat storage ceph base via dnf
@ -214,9 +207,8 @@
when: when:
- client_group_name in group_names - client_group_name in group_names
- ansible_pkg_mgr == "dnf" - ansible_pkg_mgr == "dnf"
- (ceph_stable and ceph_stable_release not in ceph_stable_releases) - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
or ceph_origin == "distro" or ceph_origin == "distro"
or ceph_dev
or ceph_custom or ceph_custom
- name: install ceph-test - name: install ceph-test

51
roles/ceph-common/tasks/main.yml
View File

@ -3,11 +3,18 @@
- include: ./checks/check_mandatory_vars.yml - include: ./checks/check_mandatory_vars.yml
# Set ceph_release
- include: ./release.yml
- include: ./checks/check_firewall.yml - include: ./checks/check_firewall.yml
when: check_firewall when: check_firewall
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./misc/system_tuning.yml - include: ./misc/system_tuning.yml
when: osd_group_name in group_names when: osd_group_name in group_names
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./pre_requisites/prerequisite_rh_storage_iso_install.yml - include: ./pre_requisites/prerequisite_rh_storage_iso_install.yml
when: when:
@ -15,6 +22,8 @@
- ceph_rhcs_iso_install - ceph_rhcs_iso_install
tags: tags:
- package-install - package-install
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./pre_requisites/prerequisite_rh_storage_cdn_install.yml - include: ./pre_requisites/prerequisite_rh_storage_cdn_install.yml
when: when:
@ -23,6 +32,8 @@
- ansible_os_family == "RedHat" - ansible_os_family == "RedHat"
tags: tags:
- package-install - package-install
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./installs/install_on_redhat.yml - include: ./installs/install_on_redhat.yml
when: when:
@ -30,6 +41,8 @@
not ceph_rhcs_iso_install not ceph_rhcs_iso_install
tags: tags:
- package-install - package-install
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./installs/install_rh_storage_on_redhat.yml - include: ./installs/install_rh_storage_on_redhat.yml
when: when:
@ -37,6 +50,8 @@
- ceph_rhcs - ceph_rhcs
tags: tags:
- package-install - package-install
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./installs/install_on_debian.yml - include: ./installs/install_on_debian.yml
when: when:
@ -44,6 +59,8 @@
- not ceph_rhcs - not ceph_rhcs
tags: tags:
- package-install - package-install
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./installs/install_rh_storage_on_debian.yml - include: ./installs/install_rh_storage_on_debian.yml
when: when:
@ -51,6 +68,8 @@
- ceph_rhcs - ceph_rhcs
tags: tags:
- package-install - package-install
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./installs/install_rgw_on_redhat.yml - include: ./installs/install_rgw_on_redhat.yml
when: when:
@ -59,6 +78,8 @@
- rgw_group_name in group_names - rgw_group_name in group_names
tags: tags:
- package-install - package-install
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./installs/install_rgw_on_debian.yml - include: ./installs/install_rgw_on_debian.yml
when: when:
@ -67,16 +88,22 @@
- rgw_group_name in group_names - rgw_group_name in group_names
tags: tags:
- package-install - package-install
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./misc/ntp_redhat.yml - include: ./misc/ntp_redhat.yml
when: when:
- ansible_os_family == 'RedHat' - ansible_os_family == 'RedHat'
- ntp_service_enabled - ntp_service_enabled
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: ./misc/ntp_debian.yml - include: ./misc/ntp_debian.yml
when: when:
- ansible_os_family == 'Debian' - ansible_os_family == 'Debian'
- ntp_service_enabled - ntp_service_enabled
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False
- include: facts.yml - include: facts.yml
@ -84,77 +111,77 @@
dir_owner: ceph dir_owner: ceph
dir_group: ceph dir_group: ceph
dir_mode: "0755" dir_mode: "0755"
when: is_after_hammer when: ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- set_fact: - set_fact:
dir_owner: root dir_owner: root
dir_group: root dir_group: root
dir_mode: "0755" dir_mode: "0755"
when: is_before_infernalis when: ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- set_fact: - set_fact:
key_owner: root key_owner: root
key_group: root key_group: root
key_mode: "0600" key_mode: "0600"
when: is_before_infernalis when: ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- set_fact: - set_fact:
key_owner: ceph key_owner: ceph
key_group: ceph key_group: ceph
key_mode: "0600" key_mode: "0600"
when: is_after_hammer when: ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- set_fact: - set_fact:
activate_file_owner: ceph activate_file_owner: ceph
activate_file_group: ceph activate_file_group: ceph
activate_file_mode: "0644" activate_file_mode: "0644"
when: is_after_hammer when: ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- set_fact: - set_fact:
activate_file_owner: root activate_file_owner: root
activate_file_group: root activate_file_group: root
activate_file_mode: "0644" activate_file_mode: "0644"
when: is_before_infernalis when: ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- set_fact: - set_fact:
rbd_client_directory_owner: root rbd_client_directory_owner: root
when: when:
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- rbd_client_directory_owner is not defined - rbd_client_directory_owner is not defined
or not rbd_client_directory_owner or not rbd_client_directory_owner
- set_fact: - set_fact:
rbd_client_directory_owner: ceph rbd_client_directory_owner: ceph
when: when:
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- rbd_client_directory_owner is not defined - rbd_client_directory_owner is not defined
or not rbd_client_directory_owner or not rbd_client_directory_owner
- set_fact: - set_fact:
rbd_client_directory_group: root rbd_client_directory_group: root
when: when:
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- rbd_client_directory_group is not defined - rbd_client_directory_group is not defined
or not rbd_client_directory_group or not rbd_client_directory_group
- set_fact: - set_fact:
rbd_client_directory_group: ceph rbd_client_directory_group: ceph
when: when:
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- rbd_client_directory_group is not defined - rbd_client_directory_group is not defined
or not rbd_client_directory_group or not rbd_client_directory_group
- set_fact: - set_fact:
rbd_client_directory_mode: "1777" rbd_client_directory_mode: "1777"
when: when:
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- rbd_client_directory_mode is not defined - rbd_client_directory_mode is not defined
or not rbd_client_directory_mode or not rbd_client_directory_mode
- set_fact: - set_fact:
rbd_client_directory_mode: "0770" rbd_client_directory_mode: "0770"
when: when:
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- rbd_client_directory_mode is not defined - rbd_client_directory_mode is not defined
or not rbd_client_directory_mode or not rbd_client_directory_mode

12
roles/ceph-common/tasks/release.yml 100644
View File

@ -0,0 +1,12 @@
---
# Set ceph_release to ceph_stable by default
- set_fact:
ceph_release: "{{ ceph_stable_release }}"
# Set ceph_release to latest known release (Which should match ceph_dev)
- set_fact:
ceph_release: "{{ item.key }}"
when:
- ceph_dev
- ({{ item.value }} > ceph_release_num.{{ ceph_release }})
with_dict: "{{ ceph_release_num }}"

6
roles/ceph-mds/tasks/pre_requisite.yml
View File

@ -76,7 +76,7 @@
failed_when: false failed_when: false
when: when:
- use_systemd - use_systemd
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: start and add that the metadata service to the init sequence (upstart) - name: start and add that the metadata service to the init sequence (upstart)
command: initctl emit ceph-mds cluster={{ cluster }} id={{ mds_name }} command: initctl emit ceph-mds cluster={{ cluster }} id={{ mds_name }}
@ -93,7 +93,7 @@
changed_when: false changed_when: false
when: when:
- not use_systemd - not use_systemd
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- name: start and add that the metadata service to the init sequence (systemd after hammer) - name: start and add that the metadata service to the init sequence (systemd after hammer)
service: service:
@ -103,4 +103,4 @@
changed_when: false changed_when: false
when: when:
- use_systemd - use_systemd
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer

4
roles/ceph-mon/tasks/create_mds_filesystems.yml
View File

@ -9,9 +9,9 @@
- cephfs_data - cephfs_data
- cephfs_metadata - cephfs_metadata
changed_when: false changed_when: false
when: not {{ ceph_version | version_compare('0.84.0', '<') }} when: ceph_release_num.{{ ceph_release }} > ceph_release_num.firefly
- name: create ceph filesystem - name: create ceph filesystem
command: ceph --cluster {{ cluster }} fs new {{ cephfs }} {{ cephfs_metadata }} {{ cephfs_data }} command: ceph --cluster {{ cluster }} fs new {{ cephfs }} {{ cephfs_metadata }} {{ cephfs_data }}
changed_when: false changed_when: false
when: not {{ ceph_version | version_compare('0.84.0', '<') }} when: ceph_release_num.{{ ceph_release }} > ceph_release_num.firefly

8
roles/ceph-mon/tasks/deploy_monitors.yml
View File

@ -50,7 +50,7 @@
creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring
when: when:
- cephx - cephx
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: ceph monitor mkfs without keyring (for or after infernalis release) - name: ceph monitor mkfs without keyring (for or after infernalis release)
command: ceph-mon --cluster {{ cluster }} --setuser ceph --setgroup ceph --mkfs -i {{ monitor_name }} --fsid {{ fsid }} command: ceph-mon --cluster {{ cluster }} --setuser ceph --setgroup ceph --mkfs -i {{ monitor_name }} --fsid {{ fsid }}
@ -58,7 +58,7 @@
creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/store.db creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/store.db
when: when:
- not cephx - not cephx
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: ceph monitor mkfs with keyring (before infernalis release) - name: ceph monitor mkfs with keyring (before infernalis release)
command: ceph-mon --mkfs -i {{ monitor_name }} --fsid {{ fsid }} --keyring /var/lib/ceph/tmp/keyring.mon.{{ monitor_name }} command: ceph-mon --mkfs -i {{ monitor_name }} --fsid {{ fsid }} --keyring /var/lib/ceph/tmp/keyring.mon.{{ monitor_name }}
@ -66,7 +66,7 @@
creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring
when: when:
- cephx - cephx
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- name: ceph monitor mkfs without keyring (before infernalis release) - name: ceph monitor mkfs without keyring (before infernalis release)
command: ceph-mon --mkfs -i {{ monitor_name }} --fsid {{ fsid }} command: ceph-mon --mkfs -i {{ monitor_name }} --fsid {{ fsid }}
@ -74,4 +74,4 @@
creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/store.db creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/store.db
when: when:
- not cephx - not cephx
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis

2
roles/ceph-mon/tasks/secure_cluster.yml
View File

@ -9,4 +9,4 @@
with_nested: with_nested:
- "{{ ceph_pools.stdout_lines|default([]) }}" - "{{ ceph_pools.stdout_lines|default([]) }}"
- secure_cluster_flags - secure_cluster_flags
when: "{{ ceph_version | version_compare('0.94.0', '>=') }}" when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.hammer

26
roles/ceph-mon/tasks/start_monitor.yml
View File

@ -20,14 +20,28 @@
when: when:
- not use_systemd - not use_systemd
# NOTE (leseb): somehow the service ansible module is messing things up # legacy ceph system v init scripts require a mon section in order to work
# as a safety measure we run the raw command # Not Ubuntu so we can catch old debian systems that don't use systemd or upstart
- name: add mon section into ceph.conf for systemv init scripts
ini_file:
dest: /etc/ceph/{{ cluster }}.conf
section: mon.{{ ansible_host }}
option: host
value: "{{ ansible_host }}"
state: present
when:
- ansible_os_family != "Ubuntu"
- ceph_release_num.{{ ceph_stable_release }} < ceph_release_num.infernalis
# NOTE (jsaintrocc): can't use service module because we need to use the
# legacy systemv init for older ceph releases. Even when the os supports systemd
# Not Ubuntu so we can catch old debian systems that don't use systemd or upstart
- name: start and add that the monitor service to the init sequence - name: start and add that the monitor service to the init sequence
command: service ceph start mon command: service ceph start mon
changed_when: false changed_when: false
when: when:
- ansible_distribution != "Ubuntu" - ansible_os_family != "Ubuntu"
- is_before_infernalis - ceph_release_num.{{ ceph_stable_release }} < ceph_release_num.infernalis
- name: start and add that the monitor service to the init sequence (for or after infernalis) - name: start and add that the monitor service to the init sequence (for or after infernalis)
command: systemctl enable ceph-mon@{{ monitor_name }} command: systemctl enable ceph-mon@{{ monitor_name }}
@ -35,7 +49,7 @@
failed_when: false failed_when: false
when: when:
- use_systemd - use_systemd
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: start the monitor service (for or after infernalis) - name: start the monitor service (for or after infernalis)
service: service:
@ -45,7 +59,7 @@
changed_when: false changed_when: false
when: when:
- use_systemd - use_systemd
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: collect admin and bootstrap keys - name: collect admin and bootstrap keys
command: ceph-create-keys --cluster {{ cluster }} --id {{ monitor_name }} command: ceph-create-keys --cluster {{ cluster }} --id {{ monitor_name }}

10
roles/ceph-osd/tasks/activate_osds.yml
View File

@ -89,7 +89,7 @@
- ansible_selinux != false - ansible_selinux != false
- ansible_selinux['status'] == 'enabled' - ansible_selinux['status'] == 'enabled'
- ansible_selinux['config_mode'] != 'disabled' - ansible_selinux['config_mode'] != 'disabled'
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- name: start and add that the osd service(s) to the init sequence (before infernalis) - name: start and add that the osd service(s) to the init sequence (before infernalis)
service: service:
@ -98,7 +98,7 @@
enabled: yes enabled: yes
when: when:
- ansible_distribution != "Ubuntu" - ansible_distribution != "Ubuntu"
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- name: get osd id (for or after infernalis) - name: get osd id (for or after infernalis)
shell: 'ls /var/lib/ceph/osd/ | grep -oP "\d+$"' shell: 'ls /var/lib/ceph/osd/ | grep -oP "\d+$"'
@ -107,7 +107,7 @@
register: osd_id register: osd_id
when: when:
- use_systemd - use_systemd
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: enable the osd service (for or after infernalis) - name: enable the osd service (for or after infernalis)
command: systemctl enable ceph-osd@{{ item }} command: systemctl enable ceph-osd@{{ item }}
@ -116,7 +116,7 @@
with_items: "{{ osd_id.stdout_lines }}" with_items: "{{ osd_id.stdout_lines }}"
when: when:
- use_systemd - use_systemd
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: start and add that the osd service(s) to the init sequence (for or after infernalis) - name: start and add that the osd service(s) to the init sequence (for or after infernalis)
service: service:
@ -127,4 +127,4 @@
changed_when: false changed_when: false
when: when:
- use_systemd - use_systemd
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer

6
roles/ceph-rbd-mirror/tasks/start_rbd_mirror.yml
View File

@ -12,7 +12,7 @@
changed_when: false changed_when: false
when: when:
- use_systemd - use_systemd
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- name: enable systemd unit file for the rbd mirror service (systemd after hammer) - name: enable systemd unit file for the rbd mirror service (systemd after hammer)
command: systemctl enable ceph-rbd-mirror@{{ ceph_rbd_mirror_local_user }} command: systemctl enable ceph-rbd-mirror@{{ ceph_rbd_mirror_local_user }}
@ -20,7 +20,7 @@
failed_when: false failed_when: false
when: when:
- use_systemd - use_systemd
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: start and add that the rbd mirror service to the init sequence (systemd after hammer) - name: start and add that the rbd mirror service to the init sequence (systemd after hammer)
service: service:
@ -30,4 +30,4 @@
changed_when: false changed_when: false
when: when:
- use_systemd - use_systemd
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer

5
roles/ceph-rgw/tasks/main.yml
View File

@ -16,7 +16,10 @@
- name: include rgw multisite playbooks - name: include rgw multisite playbooks
include: multisite/main.yml include: multisite/main.yml
when: rgw_zone is defined and rgw_multisite and ( is_jewel or is_after_jewel ) when:
- rgw_zone is defined
- rgw_multisite
- ( ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel )
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent) # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False static: False

2
roles/ceph-rgw/tasks/pre_requisite.yml
View File

@ -47,7 +47,7 @@
creates: /var/run/systemd/generator.late/ceph-radosgw.service creates: /var/run/systemd/generator.late/ceph-radosgw.service
when: when:
- ansible_os_family == "RedHat" - ansible_os_family == "RedHat"
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- name: activate rados gateway with upstart - name: activate rados gateway with upstart
file: file:

6
roles/ceph-rgw/tasks/start_radosgw.yml
View File

@ -26,7 +26,7 @@
enabled: yes enabled: yes
when: when:
- ansible_os_family == 'RedHat' - ansible_os_family == 'RedHat'
- is_before_infernalis - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
- name: enable systemd unit file for rgw instance (for or after infernalis) - name: enable systemd unit file for rgw instance (for or after infernalis)
command: systemctl enable ceph-radosgw@rgw.{{ ansible_hostname }} command: systemctl enable ceph-radosgw@rgw.{{ ansible_hostname }}
@ -34,7 +34,7 @@
failed_when: false failed_when: false
when: when:
- use_systemd - use_systemd
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
- name: start rgw with systemd (for or after infernalis) - name: start rgw with systemd (for or after infernalis)
service: service:
@ -43,4 +43,4 @@
enabled: yes enabled: yes
when: when:
- use_systemd - use_systemd
- is_after_hammer - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer