Merge pull request #1727 from ceph/refact

Refact playbook

generate_group_vars_sample.sh

@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
-
 set -euo pipefail
 
+
 #############
 # VARIABLES #
 #############
 
 basedir=$(dirname "$0")
-no_header="ceph-docker-common" # pipe separated list of roles with no header, MUST end with '$', e.g: 'foo$|bar$'
-merge_in_all="ceph-common$|ceph-docker-common$" # pipe separated list of roles you want to merge in all.yml.sample, MUST end with '$', e.g: 'foo$|bar$'
+do_not_generate="ceph-common$|ceph-docker-common$" # pipe separated list of roles we don't want to generate sample file, MUST end with '$', e.g: 'foo$|bar$'
 
 
 #############
@@ -52,7 +51,7 @@ generate_group_vars_file () {
 for role in "$basedir"/roles/ceph-*; do
   rolename=$(basename "$role")
 
-  if echo "$rolename" | grep -qE "$merge_in_all"; then
+  if [[ $rolename == "ceph-defaults" ]]; then
     output="all.yml.sample"
   elif [[ $rolename == "ceph-agent" ]]; then
     output="agent.yml.sample"
@@ -62,17 +61,13 @@ for role in "$basedir"/roles/ceph-*; do
     output="${rolename:5}s.yml.sample"
   fi
 
-
-  # Do not re-regenerate the header for certain roles
-  # since we merge them in all.yml.sample
-  if ! echo "$rolename" | grep -qE "$no_header"; then
-    populate_header
-  fi
-
   defaults="$role"/defaults/main.yml
   if [[ ! -f $defaults ]]; then
     continue
   fi
 
-  generate_group_vars_file
+  if ! echo "$rolename" | grep -qE "$do_not_generate"; then
+    populate_header
+    generate_group_vars_file
+  fi
 done

group_vars/all.yml.sample

@@ -30,6 +30,12 @@ dummy:
 # INSTALL #
 ###########
 
+# Set uid/gid to default '64045' for bootstrap directories.
+# '64045' is used for debian based distros. It must be set to 167 in case of rhel based distros.
+# These values have to be set according to the base OS used by the container image, NOT the host.
+#bootstrap_dirs_owner: "64045"
+#bootstrap_dirs_group: "64045"
+
 #mon_group_name: mons
 #osd_group_name: osds
 #rgw_group_name: rgws
@@ -197,9 +203,12 @@ dummy:
 # generated, you may find it useful to disable fsid generation to
 # avoid cluttering up your ansible repo. If you set `generate_fsid` to
 # false, you *must* generate `fsid` in another way.
+# ACTIVATE THE FSID VARIABLE FOR NON-VAGRANT DEPLOYMENT
 #fsid: "{{ cluster_uuid.stdout }}"
 #generate_fsid: true
 
+#ceph_conf_key_directory: /etc/ceph
+
 #cephx: true
 #max_open_files: 131072
 
@@ -324,6 +333,14 @@ dummy:
 #handler_health_osd_check_delay: 30
 #handler_health_osd_check: true
 
+# Confiure the type of NFS gatway access.  At least one must be enabled for an
+# NFS role to be useful
+#
+# Set this to true to enable File access via NFS.  Requires an MDS role.
+#nfs_file_gw: true
+# Set this to true to enable Object access via NFS. Requires an RGW role.
+#nfs_obj_gw: false
+
 ###################
 # CONFIG OVERRIDE #
 ###################
@@ -358,7 +375,7 @@ dummy:
 ##########
 # DOCKER #
 ##########
-
+#docker_exec_cmd:
 #docker: false
 #ceph_docker_image: "ceph/daemon"
 #ceph_docker_image_tag: latest
@@ -368,42 +385,10 @@ dummy:
 #containerized_deployment_with_kv: false
 #containerized_deployment: false
 #mon_containerized_default_ceph_conf_with_kv: false
-
-# Confiure the type of NFS gatway access.  At least one must be enabled for an
-# NFS role to be useful
-#
-# Set this to true to enable File access via NFS.  Requires an MDS role.
-#nfs_file_gw: true
-# Set this to true to enable Object access via NFS. Requires an RGW role.
-#nfs_obj_gw: false
-
-# this is only here for usage with the rolling_update.yml playbook
-# do not ever change this here
-#rolling_update: false
-
-#fsid: "{{ cluster_uuid.stdout }}"
-#generate_fsid: true
 #ceph_docker_registry: docker.io
 #ceph_docker_enable_centos_extra_repo: false
-
 #ceph_docker_on_openstack: false
 
-#mon_use_fqdn: false # if set to true, the MON name used will be the fqdn
-
-# Set uid/gid to default '64045' for bootstrap directories.
-# '64045' is used for debian based distros. It must be set to 167 in case of rhel based distros.
-# These values have to be set according to the base OS used by the container image, NOT the host.
-#bootstrap_dirs_owner: "64045"
-#bootstrap_dirs_group: "64045"
-
-#ceph_conf_key_directory: /etc/ceph
-
-###########
-# Network #
-###########
-#monitor_interface: 'interface'
-#monitor_address: '0.0.0.0'
-#monitor_address_block: []
 
 ############
 # KV store #
@@ -413,3 +398,8 @@ dummy:
 #kv_port: 2379
 #containerized_deployment_with_kv: false
 
+
+# this is only here for usage with the rolling_update.yml playbook
+# do not ever change this here
+#rolling_update: false
+

group_vars/mons.yml.sample

@@ -13,12 +13,9 @@ dummy:
 # GENERAL #
 ###########
 
-#fetch_directory: fetch/
-
 #mon_group_name: mons
 
 # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
-#fsid: "{{ cluster_uuid.stdout }}"
 #monitor_secret: "{{ monitor_keyring.stdout }}"
 #admin_secret: 'admin_secret'
 
@@ -116,7 +113,6 @@ dummy:
 ##########
 # DOCKER #
 ##########
-#docker_exec_cmd:
 #ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the monitor_interface
 
 # ceph_mon_docker_extra_env:

group_vars/osds.yml.sample

@@ -15,8 +15,6 @@ dummy:
 # GENERAL #
 ###########
 
-#fetch_directory: fetch/
-
 # Even though OSD nodes should not have the admin key
 # at their disposal, some people might want to have it
 # distributed on OSD nodes. Setting 'copy_admin_key' to 'true'
@@ -58,9 +56,6 @@ dummy:
 # CEPH OPTIONS
 ##############
 
-# ACTIVATE THE FSID VARIABLE FOR NON-VAGRANT DEPLOYMENT
-#fsid: "{{ cluster_uuid.stdout }}"
-
 # Devices to be used as OSDs
 # You can pre-provision disks that are not present yet.
 # Ansible will just skip them. Newly added disk will be

infrastructure-playbooks/osd-configure.yml

@@ -10,9 +10,11 @@
 - hosts: mons
   become: True
   roles:
+    - ceph-defaults
     - ceph-fetch-keys
 
 - hosts: osds
   become: True
   roles:
-  - ceph-osd
+    - ceph-defaults
+    - ceph-osd

infrastructure-playbooks/purge-docker-cluster.yml

@@ -97,13 +97,21 @@
 
   tasks:
 
-  - name: disable ceph rgw service
+# For backward compatibility
+  - name: disable ceph rgw service (old unit name, for backward compatibility)
     service:
       name: "ceph-rgw@{{ ansible_hostname }}"
       state: stopped
       enabled: no
     ignore_errors: true
 
+  - name: disable ceph rgw service (new unit name)
+    service:
+      name: "ceph-radosgw@{{ ansible_hostname }}"
+      state: stopped
+      enabled: no
+    ignore_errors: true
+
   - name: remove ceph rgw container
     docker:
       image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
@@ -113,8 +121,12 @@
 
   - name: remove ceph rgw service
     file:
-      path: /etc/systemd/system/ceph-rgw@.service
+      path: "{{ item }}"
       state: absent
+    with_items:
+# For backward compatibility
+      - /etc/systemd/system/ceph-rgw@.service
+      - /etc/systemd/system/ceph-radosgw@.service
 
   - name: remove ceph rgw image
     docker_image:

infrastructure-playbooks/rgw-standalone.yml

@@ -6,9 +6,11 @@
 - hosts: mons
   become: True
   roles:
+    - ceph-defaults
     - ceph-fetch-keys
 
 - hosts: rgws
   become: True
   roles:
-  - ceph-rgw
+    - ceph-defaults
+    - ceph-rgw

infrastructure-playbooks/rolling_update.yml

@@ -41,6 +41,7 @@
     - "{{ mds_group_name|default('mdss') }}"
     - "{{ rgw_group_name|default('rgws') }}"
     - "{{ mgr_group_name|default('mgrs') }}"
+    - "{{ client_group_name|default('clients') }}"
 
   become: True
   tasks:
@@ -91,6 +92,9 @@
         - not containerized_deployment
 
   roles:
+    - ceph-defaults
+    - { role: ceph-common, when: not containerized_deployment }
+    - { role: ceph-docker-common, when: containerized_deployment }
     - ceph-mon
 
   post_tasks:
@@ -224,6 +228,9 @@
         - not containerized_deployment
 
   roles:
+    - ceph-defaults
+    - { role: ceph-common, when: not containerized_deployment }
+    - { role: ceph-docker-common, when: containerized_deployment }
     - ceph-osd
 
   post_tasks:
@@ -341,6 +348,9 @@
         - not containerized_deployment
 
   roles:
+    - ceph-defaults
+    - { role: ceph-common, when: not containerized_deployment }
+    - { role: ceph-docker-common, when: containerized_deployment }
     - ceph-mds
 
   post_tasks:
@@ -411,6 +421,9 @@
         - not containerized_deployment
 
   roles:
+    - ceph-defaults
+    - { role: ceph-common, when: not containerized_deployment }
+    - { role: ceph-docker-common, when: containerized_deployment }
     - ceph-rgw
 
   post_tasks:
@@ -437,9 +450,26 @@
 
     - name: restart containerized ceph rgws with systemd
       service:
-        name: ceph-rgw@{{ ansible_hostname }}
+        name: ceph-radosgw@{{ ansible_hostname }}
         state: restarted
         enabled: yes
       when:
         - ansible_service_mgr == 'systemd'
         - containerized_deployment
+
+
+- name: upgrade ceph client node
+
+  vars:
+    upgrade_ceph_packages: True
+
+  hosts:
+    - "{{ client_group_name|default('clients') }}"
+
+  serial: 1
+  become: True
+
+  roles:
+    - ceph-defaults
+    - ceph-common
+    - ceph-client

infrastructure-playbooks/shrink-mon.yml

@@ -27,7 +27,7 @@
       private: no
 
   tasks:
-  - include_vars: roles/ceph-common/defaults/main.yml
+  - include_vars: roles/ceph-defaults/defaults/main.yml
   - include_vars: group_vars/all.yml
 
   - name: exit playbook, if only one monitor is present in cluster

infrastructure-playbooks/shrink-osd.yml

@@ -27,7 +27,7 @@
       private: no
 
   tasks:
-  - include_vars: roles/ceph-common/defaults/main.yml
+  - include_vars: roles/ceph-defaults/defaults/main.yml
   - include_vars: group_vars/all.yml
 
   - name: exit playbook, if user did not mean to shrink cluster

infrastructure-playbooks/take-over-existing-cluster.yml

@@ -14,16 +14,17 @@
 - hosts: mons
   become: True
   vars_files:
-    - roles/ceph-common/defaults/main.yml
+    - roles/ceph-defaults/defaults/main.yml
     - group_vars/all.yml
   roles:
+    - ceph-defaults
     - ceph-fetch-keys
 
 - hosts: all
   become: true
 
   tasks:
-    - include_vars: roles/ceph-common/defaults/main.yml
+    - include_vars: roles/ceph-defaults/defaults/main.yml
     - include_vars: group_vars/all.yml
 
     - name: get the name of the existing ceph cluster

roles/ceph-client/meta/main.yml

@@ -10,5 +10,4 @@ galaxy_info:
         - trusty
   categories:
     - system
-dependencies:
-  - { role: ceph.ceph-common }
+dependencies: []