]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Added ceph_release generation and fixed missing whitespace in ceph_release checks
authorJames Saint-Rossy <james_saintrossy@cable.comcast.com>
Fri, 9 Sep 2016 22:16:41 +0000 (18:16 -0400)
committerJames Saint-Rossy <james_saintrossy@cable.comcast.com>
Fri, 9 Sep 2016 22:16:41 +0000 (18:16 -0400)
14 files changed:
roles/ceph-common-coreos/defaults/main.yml
roles/ceph-common-coreos/tasks/main.yml
roles/ceph-common/handlers/main.yml
roles/ceph-common/tasks/installs/install_on_redhat.yml
roles/ceph-common/tasks/main.yml
roles/ceph-common/tasks/release.yml [new file with mode: 0644]
roles/ceph-mds/tasks/pre_requisite.yml
roles/ceph-mon/tasks/deploy_monitors.yml
roles/ceph-mon/tasks/start_monitor.yml
roles/ceph-osd/tasks/activate_osds.yml
roles/ceph-rbd-mirror/tasks/start_rbd_mirror.yml
roles/ceph-rgw/tasks/main.yml
roles/ceph-rgw/tasks/pre_requisite.yml
roles/ceph-rgw/tasks/start_radosgw.yml

index 8b21fb8301e09857129beed4ddbe64627dfb717b..6263de7003184b0910fde26bc8e4449d9b594099 100644 (file)
@@ -4,4 +4,4 @@ coreos_pypy_url: https://bitbucket.org/pypy/pypy/downloads/pypy-{{coreos_pypy_ve
 pypy_directory: /opt/pypy
 pypy_binary_directory: /opt/bin
 pip_url: https://bootstrap.pypa.io/get-pip.py
-local_temp_directory: /tmp
\ No newline at end of file
+local_temp_directory: /tmp
index 4f3404a14299bc59d3344ade8f1d66a7ad2cc021..7e3665afca73e4071648c54966a451db3d4c6022 100644 (file)
@@ -13,4 +13,4 @@
   ignore_errors: true
 
 - include: install_pip.yml
-  when: need_pip | failed and need_python | failed
\ No newline at end of file
+  when: need_pip | failed and need_python | failed
index 9a547d1a660e429dbd76af4a2432f09075a5025e..cf54487f43fbab6eeda2660b0cbed19693dfe116 100644 (file)
@@ -9,7 +9,7 @@
     - socket.rc == 0
     - ansible_distribution != 'Ubuntu'
     - mon_group_name in group_names
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
 
 - name: restart ceph mons with systemd
   service:
@@ -19,7 +19,7 @@
     - socket.rc == 0
     - use_systemd
     - mon_group_name in group_names
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - 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 }}
@@ -35,7 +35,7 @@
     - socket.rc == 0
     - ansible_distribution != 'Ubuntu'
     - osd_group_name in group_names
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.infernalis
+    - 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
@@ -48,7 +48,7 @@
     - socket.rc == 0
     - use_systemd
     - osd_group_name in group_names
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
 
 - name: restart ceph osds on ubuntu
   shell: |
@@ -76,7 +76,7 @@
     - ansible_distribution != 'Ubuntu'
     - use_systemd
     - mds_group_name in group_names
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
 
 - name: restart ceph mdss with systemd
   service:
@@ -86,7 +86,7 @@
     - socket.rc == 0
     - use_systemd
     - mds_group_name in group_names
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - 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 }}
     - socketrgw.rc == 0
     - ansible_distribution != 'Ubuntu'
     - rgw_group_name in group_names
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
 
 - name: restart ceph rgws on red hat
   command: /etc/init.d/ceph-radosgw restart
     - socketrgw.rc == 0
     - ansible_os_family == 'RedHat'
     - rgw_group_name in group_names
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
 
 - name: restart ceph rgws with systemd
   service:
     - socketrgw.rc == 0
     - use_systemd
     - rgw_group_name in group_names
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
 
 - name: restart apache2
   service:
index 3e582609113ad93df2d41bb21b7221a4531cf411..83d090a54d3c94faea4428a7ee4f262e7a2ea5ea 100644 (file)
@@ -76,7 +76,7 @@
     name: ceph
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   when:
-    - ceph_release_num.{{ ceph_release}} <= ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} <= ceph_release_num.infernalis
     - ansible_pkg_mgr == "yum"
     - ceph_origin != 'local'
 
   when:
     - mon_group_name in group_names
     - ansible_pkg_mgr == "yum"
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_custom
 
   when:
     - mon_group_name in group_names
     - ansible_pkg_mgr == "dnf"
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_custom
 
   when:
     - osd_group_name in group_names
     - ansible_pkg_mgr == "yum"
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_custom
 
   when:
     - osd_group_name in group_names
     - ansible_pkg_mgr == "dnf"
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_custom
 
   when:
     - mds_group_name in group_names
     - ansible_pkg_mgr == "yum"
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_custom
 
   when:
     - mds_group_name in group_names
     - ansible_pkg_mgr == "dnf"
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_custom
 
   when:
     - client_group_name in group_names
     - ansible_pkg_mgr == "yum"
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_custom
 
   when:
     - client_group_name in group_names
     - ansible_pkg_mgr == "dnf"
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.infernalis
       or ceph_origin == "distro"
       or ceph_custom
 
index f43c919b991e2c5fc1bf35ad2c115ae225cbe7d8..647293bfc70b12995fb5ac8d4972a0c80ebf16e7 100644 (file)
     dir_owner: ceph
     dir_group: ceph
     dir_mode: "0755"
-  when: ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+  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
+  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
+  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
+  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
+  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
+  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
+    - 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
+    - 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
+    - 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
+    - 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
+    - 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
+    - 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/roles/ceph-common/tasks/release.yml b/roles/ceph-common/tasks/release.yml
new file mode 100644 (file)
index 0000000..ec190d3
--- /dev/null
@@ -0,0 +1,11 @@
+---
+# 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 and ({{ item.value }} > ceph_release_num.{{ ceph_release }})
+  with_dict: "{{ ceph_release_num }}"
index bc9d18c067094ff5631b74f1906a57326034fe97..7d20b5acd7d569b9e3eb59c5e062635ed955421e 100644 (file)
@@ -76,7 +76,7 @@
   failed_when: false
   when:
     - use_systemd
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
 
 - name: start and add that the metadata service to the init sequence (upstart)
   command: initctl emit ceph-mds cluster={{ cluster }} id={{ mds_name }}
@@ -93,7 +93,7 @@
   changed_when: false
   when:
     - not use_systemd
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.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)
   service:
   changed_when: false
   when:
     - use_systemd
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
index eef3f1e6abc0442316431420b677808e87e9807c..910b718e68c564cb7fe083dab34981180300d033 100644 (file)
@@ -50,7 +50,7 @@
     creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring
   when:
     - cephx
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
 
 - 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 }}
@@ -58,7 +58,7 @@
     creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/store.db
   when:
     - not cephx
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
 
 - 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 }}
@@ -66,7 +66,7 @@
     creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring
   when:
     - cephx
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
 
 - name: ceph monitor mkfs without keyring (before infernalis release)
   command: ceph-mon --mkfs -i {{ monitor_name }} --fsid {{ fsid }}
@@ -74,4 +74,4 @@
     creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/store.db
   when:
     - not cephx
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
index d1be15c0015f73e58ac00f638d600fee18557889..c308481c0c6be1adb5e78101296dc79f67090c64 100644 (file)
@@ -47,7 +47,7 @@
   failed_when: false
   when:
     - use_systemd
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
 
 - name: start the monitor service (for or after infernalis)
   service:
@@ -57,7 +57,7 @@
   changed_when: false
   when:
     - use_systemd
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
 
 - name: collect admin and bootstrap keys
   command: ceph-create-keys --cluster {{ cluster }} --id {{ monitor_name }}
index a4bc7ea7a91b64f28a03a46649cc40fc79270d31..1662f8b298ee974be253820cb981e84d03bfd5ff 100644 (file)
@@ -89,7 +89,7 @@
     - ansible_selinux != false
     - ansible_selinux['status'] == 'enabled'
     - ansible_selinux['config_mode'] != 'disabled'
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.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)
   service:
@@ -98,7 +98,7 @@
     enabled: yes
   when:
     - ansible_distribution != "Ubuntu"
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
 
 - name: get osd id (for or after infernalis)
   shell: 'ls /var/lib/ceph/osd/ | grep -oP "\d+$"'
   register: osd_id
   when:
     - use_systemd
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
 
 - name: enable the osd service (for or after infernalis)
   command: systemctl enable ceph-osd@{{ item }}
   with_items: "{{ osd_id.stdout_lines }}"
   when:
     - use_systemd
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.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)
   service:
   changed_when: false
   when:
     - use_systemd
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
index 3b0240d7c7d59f7c325f03678ad237062c1741a0..e64ef75328955bac971b22658c89d0fce3744fa9 100644 (file)
@@ -12,7 +12,7 @@
   changed_when: false
   when:
     - use_systemd
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
 
 - name: enable systemd unit file for the rbd mirror service (systemd after hammer)
   command: systemctl enable ceph-rbd-mirror@{{ ceph_rbd_mirror_local_user }}
@@ -20,7 +20,7 @@
   failed_when: false
   when:
     - use_systemd
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.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)
   service:
@@ -30,4 +30,4 @@
   changed_when: false
   when:
     - use_systemd
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
index 9796abb8e25cecd56f404971460c40ed3d951b93..ab1d53ae59aa93b871169640be6e371e24e14adc 100644 (file)
@@ -16,7 +16,7 @@
 
 - name: include rgw multisite playbooks
   include: multisite/main.yml
-  when: rgw_zone is defined and rgw_multisite and ( ceph_release_num.{{ ceph_release}} >= ceph_release_num.jewel )
+  when: rgw_zone is defined and rgw_multisite and ( 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)
   static: False
 
index ebcab44cd0bef896d099e93a15a997b3362c0787..d6ccda14aa80c55249959e1dcb1c82547c5111ce 100644 (file)
@@ -47,7 +47,7 @@
     creates: /var/run/systemd/generator.late/ceph-radosgw.service
   when:
     - ansible_os_family == "RedHat"
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
 
 - name: activate rados gateway with upstart
   file:
index adc226411adcc900371a4640662902f8c463cc90..9d1547ca3c1e32eeff3eebe354b09e38aa682892 100644 (file)
@@ -26,7 +26,7 @@
     enabled: yes
   when:
     - ansible_os_family == 'RedHat'
-    - ceph_release_num.{{ ceph_release}} < ceph_release_num.infernalis
+    - ceph_release_num.{{ ceph_release }} < ceph_release_num.infernalis
 
 - name: enable systemd unit file for rgw instance (for or after infernalis)
   command: systemctl enable ceph-radosgw@rgw.{{ ansible_hostname }}
@@ -34,7 +34,7 @@
   failed_when: false
   when:
     - use_systemd
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer
 
 - name: start rgw with systemd (for or after infernalis)
   service:
@@ -43,4 +43,4 @@
     enabled: yes
   when:
     - use_systemd
-    - ceph_release_num.{{ ceph_release}} > ceph_release_num.hammer
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.hammer