Skip to content
Snippets Groups Projects
Commit cf2d54d8 authored by Eric Cook's avatar Eric Cook
Browse files

Add ceph_stable_releases array to ceph-common/defaults/main.yml

rework the various `when' tests to use that array.
parent 3a6c5ec4
No related branches found
No related tags found
No related merge requests found
......@@ -25,12 +25,7 @@
mode: 0600
owner: ceph
group: ceph
when:
ceph_stable_release != 'dumpling' and
ceph_stable_release != 'emperor' and
ceph_stable_release != 'firefly' and
ceph_stable_release != 'giant' and
ceph_stable_release != 'hammer'
when: ceph_stable_release not in ceph_stable_releases
- name: create monitor directory (for or after infernalis release)
file:
......@@ -39,12 +34,7 @@
owner: ceph
group: ceph
mode: 0755
when:
ceph_stable_release != 'dumpling' and
ceph_stable_release != 'emperor' and
ceph_stable_release != 'firefly' and
ceph_stable_release != 'giant' and
ceph_stable_release != 'hammer'
when: ceph_stable_release not in ceph_stable_releases
- name: set initial monitor key permissions (before infernalis release)
file:
......@@ -52,12 +42,7 @@
mode: 0600
owner: root
group: root
when:
ceph_stable_release == 'dumpling' or
ceph_stable_release == 'emperor' or
ceph_stable_release == 'firefly' or
ceph_stable_release == 'giant' or
ceph_stable_release == 'hammer'
when: ceph_stable_release in ceph_stable_releases
- name: create monitor directory (before infernalis release)
file:
......@@ -66,31 +51,16 @@
owner: root
group: root
mode: 0755
when:
ceph_stable_release == 'dumpling' or
ceph_stable_release == 'emperor' or
ceph_stable_release == 'firefly' or
ceph_stable_release == 'giant' or
ceph_stable_release == 'hammer'
when: ceph_stable_release in ceph_stable_releases
- name: ceph monitor mkfs (for or after infernalis release)
command: ceph-mon --setuser ceph --setgroup ceph --mkfs -i {{ ansible_hostname }} --fsid {{ fsid }} --keyring /var/lib/ceph/tmp/keyring.mon.{{ ansible_hostname }}
args:
creates: /var/lib/ceph/mon/ceph-{{ ansible_hostname }}/keyring
when:
ceph_stable_release != 'dumpling' and
ceph_stable_release != 'emperor' and
ceph_stable_release != 'firefly' and
ceph_stable_release != 'giant' and
ceph_stable_release != 'hammer'
when: ceph_stable_release not in ceph_stable_releases
- name: ceph monitor mkfs (before infernalis release)
command: ceph-mon --mkfs -i {{ ansible_hostname }} --fsid {{ fsid }} --keyring /var/lib/ceph/tmp/keyring.mon.{{ ansible_hostname }}
args:
creates: /var/lib/ceph/mon/ceph-{{ ansible_hostname }}/keyring
when:
ceph_stable_release == 'dumpling' or
ceph_stable_release == 'emperor' or
ceph_stable_release == 'firefly' or
ceph_stable_release == 'giant' or
ceph_stable_release == 'hammer'
when: ceph_stable_release in ceph_stable_releases
......@@ -9,13 +9,8 @@
with_items:
- done
- upstart
when:
ansible_distribution == "Ubuntu" and
(ceph_stable_release != 'dumpling' and
ceph_stable_release != 'emperor' and
ceph_stable_release != 'firefly' and
ceph_stable_release != 'giant' and
ceph_stable_release != 'hammer')
when:
ansible_distribution == "Ubuntu" and ceph_stable_release not in ceph_stable_releases
changed_when: false
......@@ -31,11 +26,7 @@
- upstart
when:
ansible_distribution == "Ubuntu" and
(ceph_stable_release == 'dumpling' or
ceph_stable_release == 'emperor' or
ceph_stable_release == 'firefly' or
ceph_stable_release == 'giant' or
ceph_stable_release == 'hammer')
ceph_stable_release in ceph_stable_releases
changed_when: false
- name: start and add that the monitor service to the init sequence (ubuntu)
......@@ -53,11 +44,7 @@
changed_when: false
when:
ansible_distribution != "Ubuntu" and
(ceph_stable_release == 'dumpling' or
ceph_stable_release == 'emperor' or
ceph_stable_release == 'firefly' or
ceph_stable_release == 'giant' or
ceph_stable_release == 'hammer')
ceph_stable_release in ceph_stable_releases
- name: start and add that the monitor service to the init sequence (for or after infernalis)
service:
......@@ -66,12 +53,8 @@
enabled: yes
changed_when: false
when:
ansible_distribution != "Ubuntu" and not
(ceph_stable_release == 'dumpling' or
ceph_stable_release == 'emperor' or
ceph_stable_release == 'firefly' or
ceph_stable_release == 'giant' or
ceph_stable_release == 'hammer')
ansible_distribution != "Ubuntu" and
ceph_stable_release not in ceph_stable_releases
- name: collect admin and bootstrap keys
command: ceph-create-keys --id {{ ansible_hostname }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment