]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
name includes and set_fact for clarity 1904/head
authorSébastien Han <seb@redhat.com>
Thu, 14 Sep 2017 22:48:53 +0000 (16:48 -0600)
committerSébastien Han <seb@redhat.com>
Mon, 18 Sep 2017 21:39:46 +0000 (23:39 +0200)
When Ansible is not run with verbose options it's difficult to see which
include and/or set_fact does what. So adding a name for each clarifies.

Signed-off-by: Sébastien Han <seb@redhat.com>
91 files changed:
roles/ceph-agent/tasks/main.yml
roles/ceph-client/tasks/main.yml
roles/ceph-client/tasks/pre_requisite.yml
roles/ceph-common/tasks/checks/check_ntp_debian.yml
roles/ceph-common/tasks/checks/check_ntp_redhat.yml
roles/ceph-common/tasks/checks/check_system.yml
roles/ceph-common/tasks/configure_cluster_name.yml
roles/ceph-common/tasks/create_rbd_client_dir.yml
roles/ceph-common/tasks/facts_mon_fsid.yml
roles/ceph-common/tasks/installs/configure_debian_repository_installation.yml
roles/ceph-common/tasks/installs/configure_redhat_repository_installation.yml
roles/ceph-common/tasks/installs/debian_enterprise_repository.yml
roles/ceph-common/tasks/installs/install_debian_enterprise_packages.yml
roles/ceph-common/tasks/installs/install_on_debian.yml
roles/ceph-common/tasks/installs/install_on_redhat.yml
roles/ceph-common/tasks/installs/install_redhat_packages.yml
roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml
roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install.yml
roles/ceph-common/tasks/installs/redhat_enterprise_repository.yml
roles/ceph-common/tasks/main.yml
roles/ceph-common/tasks/misc/ntp_atomic.yml
roles/ceph-common/tasks/misc/ntp_debian.yml
roles/ceph-common/tasks/misc/ntp_redhat.yml
roles/ceph-common/tasks/misc/system_tuning.yml
roles/ceph-common/tasks/release-rhcs.yml
roles/ceph-config/tasks/main.yml
roles/ceph-defaults/handlers/main.yml
roles/ceph-defaults/tasks/facts.yml
roles/ceph-defaults/tasks/main.yml
roles/ceph-docker-common/tasks/checks.yml
roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml
roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml
roles/ceph-docker-common/tasks/fetch_configs.yml
roles/ceph-docker-common/tasks/fetch_image.yml
roles/ceph-docker-common/tasks/main.yml
roles/ceph-docker-common/tasks/misc/ntp_atomic.yml
roles/ceph-docker-common/tasks/misc/ntp_debian.yml
roles/ceph-docker-common/tasks/misc/ntp_redhat.yml
roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml
roles/ceph-docker-common/tasks/release.yml
roles/ceph-docker-common/tasks/stat_ceph_files.yml
roles/ceph-fetch-keys/tasks/main.yml
roles/ceph-iscsi-gw/tasks/deploy_ssl_keys.yml
roles/ceph-iscsi-gw/tasks/main.yml
roles/ceph-mds/tasks/docker/copy_configs.yml
roles/ceph-mds/tasks/docker/main.yml
roles/ceph-mds/tasks/main.yml
roles/ceph-mgr/tasks/docker/copy_configs.yml
roles/ceph-mgr/tasks/docker/main.yml
roles/ceph-mgr/tasks/main.yml
roles/ceph-mon/tasks/ceph_keys.yml
roles/ceph-mon/tasks/crush_rules.yml
roles/ceph-mon/tasks/deploy_monitors.yml
roles/ceph-mon/tasks/docker/copy_configs.yml
roles/ceph-mon/tasks/docker/main.yml
roles/ceph-mon/tasks/main.yml
roles/ceph-mon/tasks/set_osd_pool_default_pg_num.yml
roles/ceph-nfs/tasks/docker/main.yml
roles/ceph-nfs/tasks/main.yml
roles/ceph-nfs/tasks/pre_requisite.yml
roles/ceph-osd/tasks/activate_osds.yml
roles/ceph-osd/tasks/ceph_disk_cli_options_facts.yml
roles/ceph-osd/tasks/check_devices.yml
roles/ceph-osd/tasks/check_mandatory_vars.yml
roles/ceph-osd/tasks/copy_configs.yml
roles/ceph-osd/tasks/docker/main.yml
roles/ceph-osd/tasks/docker/start_docker_osd.yml
roles/ceph-osd/tasks/main.yml
roles/ceph-osd/tasks/osd_fragment.yml
roles/ceph-osd/tasks/pre_requisite.yml
roles/ceph-osd/tasks/start_osds.yml
roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml
roles/ceph-rbd-mirror/tasks/docker/main.yml
roles/ceph-rbd-mirror/tasks/main.yml
roles/ceph-rbd-mirror/tasks/start_rbd_mirror.yml
roles/ceph-restapi/tasks/docker/copy_configs.yml
roles/ceph-restapi/tasks/docker/main.yml
roles/ceph-restapi/tasks/main.yml
roles/ceph-restapi/tasks/pre_requisite.yml
roles/ceph-restapi/tasks/start_restapi.yml
roles/ceph-rgw/tasks/docker/copy_configs.yml
roles/ceph-rgw/tasks/docker/copy_rgw_configs.yml
roles/ceph-rgw/tasks/docker/main.yml
roles/ceph-rgw/tasks/main.yml
roles/ceph-rgw/tasks/multisite/destroy.yml
roles/ceph-rgw/tasks/multisite/main.yml
roles/ceph-rgw/tasks/multisite/master.yml
roles/ceph-rgw/tasks/multisite/secondary.yml
roles/ceph-rgw/tasks/openstack-keystone.yml
roles/ceph-rgw/tasks/rgw_pool_pgs.yml

index 091baf71d8e6a4231c54bc7c6182e96ad4538d09..9f715976658b7fad1b194f1d04537c0533808cd3 100644 (file)
@@ -1,4 +1,6 @@
 ---
-- include: pre_requisite.yml
+- name: include pre_requisite.yml
+  include: pre_requisite.yml
 
-- include: start_agent.yml
+- name: include start_agent.yml
+  include: start_agent.yml
index 36ec8a765676242caab6fa0b3f32705dc5c2bd01..72ca8a195a020fce59e296c65692810eddd9e97b 100644 (file)
@@ -1,6 +1,9 @@
 ---
-- include: pre_requisite.yml
-- include: create_users_keys.yml
+- name: include pre_requisite.yml
+  include: pre_requisite.yml
+
+- name: include create_users_keys.yml
+  include: create_users_keys.yml
   when:
     - user_config
     - global_in_ceph_conf_overrides
index f9f9df913eb054a6faeeb155376a8824b302ee0e..94c0d2735ed91d8d34cc02a6363e3f11c2923f7e 100644 (file)
@@ -22,6 +22,6 @@
     - cephx
     - copy_admin_key
 
-- name: check if global key exists in ceph_conf_overrides
+- name: set_fact global_in_ceph_conf_overrides
   set_fact:
     global_in_ceph_conf_overrides: "{{ 'global' in ceph_conf_overrides }}"
index 7da8f5bee725b70c30281c2f08807fb414768e72..c666958ca5926a8534719c863e81a51915e3124c 100644 (file)
@@ -5,7 +5,8 @@
   ignore_errors: true
   always_run: true
   changed_when: false
-  when: ansible_os_family == 'Debian'
+  when:
+    - ansible_os_family == 'Debian'
 
 - name: install ntp on debian
   package:
index 0e4772f5496eb9123cd35c13f634441062cefadb..2a957b4553a87dd8da66fc896ac372295e7251e2 100644 (file)
@@ -5,7 +5,8 @@
   ignore_errors: true
   always_run: true
   changed_when: false
-  when: ansible_os_family == 'RedHat'
+  when:
+    - ansible_os_family == 'RedHat'
 
 - name: install ntp on redhat
   package:
index 9d909a6fdc2bc147aef5a8385cb6f54d7e9e786c..b9b7c991885305e45d61bd8c0cffe4d299563146 100644 (file)
@@ -2,17 +2,20 @@
 - name: fail on unsupported system
   fail:
     msg: "System not supported {{ ansible_system }}"
-  when: "'{{ ansible_system }}' not in ['Linux']"
+  when:
+    - ansible_system not in ['Linux']
 
 - name: fail on unsupported architecture
   fail:
     msg: "Architecture not supported {{ ansible_architecture }}"
-  when: "'{{ ansible_architecture }}' not in ['x86_64', 'ppc64le', 'armv7l']"
+  when:
+    - ansible_architecture not in ['x86_64', 'ppc64le', 'armv7l']
 
 - name: fail on unsupported distribution
   fail:
     msg: "Distribution not supported {{ ansible_os_family }}"
-  when: "'{{ ansible_os_family }}' not in ['Debian', 'RedHat', 'ClearLinux']"
+  when:
+    - ansible_os_family not in ['Debian', 'RedHat', 'ClearLinux']
 
 - name: fail on unsupported distribution for red hat ceph storage
   fail:
@@ -65,7 +68,8 @@
 - name: fail if systemd is not present
   fail:
     msg: "Systemd must be present"
-  when: ansible_service_mgr != 'systemd'
+  when:
+    - ansible_service_mgr != 'systemd'
 
 - name: fail on unsupported distribution for iscsi gateways
   fail:
index bd37af88640c15bcb768795eefcfd424e78f47ec..373a87effa7af94f8adb3583367fbf896cd04fda 100644 (file)
@@ -5,7 +5,8 @@
     insertafter: EOF
     create: yes
     line: "CLUSTER={{ cluster }}"
-  when: ansible_os_family == "RedHat"
+  when:
+    - ansible_os_family == "RedHat"
 
 # NOTE(leseb): we are performing the following check
 # to ensure any Jewel installation will not fail.
@@ -22,7 +23,8 @@
     path: /etc/default/ceph
   register: etc_default_ceph
   always_run: true
-  when: ansible_os_family == "Debian"
+  when:
+    - ansible_os_family == "Debian"
 
 - name: configure cluster name
   lineinfile:
index f893bbcfc5049e0ac6eb452a46d55be6e397016e..c55909d76947c03cbb69733add2371c29841db45 100644 (file)
@@ -9,4 +9,5 @@
   with_items:
     - "{{ rbd_client_admin_socket_path }}"
     - "{{ rbd_client_log_path }}"
-  when: rbd_client_directories
+  when:
+    - rbd_client_directories
index cafe13ae36b11b76a54c503e6ad705f726829e91..683ff0cf6fe9ca9adee3b980953f2cdae3134df2 100644 (file)
@@ -27,7 +27,8 @@
 - name: fail if initial mon keyring found doesn't work
   fail:
     msg: "Initial mon keyring found doesn't work."
-  when: test_initial_monitor_keyring.rc != 0
+  when:
+    - test_initial_monitor_keyring.rc != 0
 
 - name: write initial mon keyring in {{ fetch_directory }}/monitor_keyring.conf if it doesn't exist
   local_action: shell echo {{ monitor_keyring.stdout }} | tee {{ fetch_directory }}/monitor_keyring.conf
@@ -37,4 +38,5 @@
 
 - name: put initial mon keyring in mon kv store
   command: ceph --cluster {{ cluster }} config-key put initial_mon_keyring {{ monitor_keyring.stdout }}
-  when: test_initial_monitor_keyring.rc == 0
+  when:
+    - test_initial_monitor_keyring.rc == 0
index b404141caecc72c897dc98be68d73c58cf24b5e6..466f262830b1e9e13c0b7b8cb8a2dc76a64e7573 100644 (file)
@@ -1,25 +1,25 @@
 ---
-- name: configure debian community repository
+- name: include debian_community_repository.yml
   include: debian_community_repository.yml
   when:
     - ceph_repository == 'community'
 
-- name: configure debian rhcs repository
+- name: include debian_rhcs_repository.yml
   include: debian_rhcs_repository.yml
   when:
     - ceph_repository == 'rhcs'
 
-- name: configure debian dev repository
+- name: include debian_dev_repository.yml
   include: debian_dev_repository.yml
   when:
     - ceph_repository == 'dev'
 
-- name: configure debian custom repository
+- name: include debian_custom_repository.yml
   include: debian_custom_repository.yml
   when:
     - ceph_repository == 'custom'
 
-- name: configure debian cloud archive repository
+- name: include debian_uca_repository.yml
   include: debian_uca_repository.yml
   when:
     - ceph_repository == 'uca'
index 8674062be6f1d6ddc52fa8a9f6ebcc07c55cf070..d63094c7e1b434e4ee36399c257bb6e755c5b07e 100644 (file)
@@ -1,20 +1,20 @@
 ---
-- name: configure redhat community repository
+- name: include redhat_community_repository.yml
   include: redhat_community_repository.yml
   when:
     - ceph_repository == 'community'
 
-- name: configure redhat rhcs repository
+- name: include redhat_rhcs_repository.yml
   include: redhat_rhcs_repository.yml
   when:
     - ceph_repository == 'rhcs'
 
-- name: configure redhat dev repository
+- name: include redhat_dev_repository.yml
   include: redhat_dev_repository.yml
   when:
     - ceph_repository == 'dev'
 
-- name: configure redhat custom repository
+- name: include redhat_custom_repository.yml
   include: redhat_custom_repository.yml
   when:
     - ceph_repository == 'custom'
index 853b4a8a374d27d511cc78b14f3af8fe6970bc51..9dcb0ba7ac361a8dc2eb8f22e304783a6c035914 100644 (file)
@@ -1,4 +1,5 @@
 ---
-- include: prerequisite_rhcs_cdn_install_debian.yml
+- name: include prerequisite_rhcs_cdn_install_debian.yml
+  include: prerequisite_rhcs_cdn_install_debian.yml
   when:
     - ceph_repository_type == 'cdn'
index 5dd37863ce8df637bf2d7f0eba0d29e1470437a0..02a07102b9c03f520e981cea56171aa419e6016f 100644 (file)
@@ -3,55 +3,63 @@
   apt:
     name: ceph-mon
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: mon_group_name in group_names
+  when:
+    - mon_group_name in group_names
 
 - name: install red hat storage ceph osd for debian
   apt:
     name: ceph-osd
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: osd_group_name in group_names
+  when:
+    - osd_group_name in group_names
 
 - name: install ceph-test for debian
   apt:
     name: ceph-test
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: ceph_test
+  when:
+    - ceph_test
 
 - name: install red hat storage radosgw for debian
   apt:
     name: radosgw
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: rgw_group_name in group_names
+  when:
+    - rgw_group_name in group_names
 
 - name: install red hat storage ceph mds for debian
   apt:
     pkg: ceph-mds
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: mds_group_name in group_names
+  when:
+    - mds_group_name in group_names
 
 - name: install red hat storage ceph-fuse client for debian
   apt:
     pkg: ceph-fuse
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: client_group_name in group_names
+  when:
+    - client_group_name in group_names
 
 - name: install red hat storage ceph-common for debian
   apt:
     pkg: ceph-common
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: client_group_name in group_names
+  when:
+    - client_group_name in group_names
 
 - name: install red hat storage nfs gateway for debian
   apt:
     name: nfs-ganesha
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: nfs_group_name in group_names
+  when:
+    - nfs_group_name in group_names
 
 - name: install red hat storage nfs file gateway
   apt:
     name: nfs-ganesha-ceph
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: 
+  when:
     - nfs_group_name in group_names
     - nfs_file_gw
 
@@ -59,7 +67,7 @@
   apt:
     name: nfs-ganesha-rgw
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: 
+  when:
     - nfs_group_name in group_names
     - nfs_obj_gw
 
index ca621b5387a31280c92daad994dc67f89a128adc..d96ad26b58ba25b6d606f17326e3ba9d1f2b2a99 100644 (file)
@@ -1,5 +1,5 @@
 ---
-- name: configure debian repository installation
+- name: include configure_debian_repository_installation.yml
   include: configure_debian_repository_installation.yml
   when:
     - ceph_origin == 'repository'
   apt:
     update_cache: yes
 
-- name: install ceph debian packages
+- name: include install_debian_packages.yml
   include: install_debian_packages.yml
   when:
     - (ceph_origin == 'repository' or ceph_origin == 'distro')
     - ceph_repository != 'rhcs'
 
-- name: install ceph rhcs debian packages
+- name: include install_debian_rhcs_packages.yml
   include: install_debian_rhcs_packages.yml
   when:
     - (ceph_origin == 'repository' or ceph_origin == 'distro')
index 30cb4833703364d23239e2b023674234dab8b49a..3ddb88ef0a2aad918fc3f0ef56db57435e49a044 100644 (file)
@@ -1,15 +1,15 @@
 ---
-- name: configure redhat repository installation
+- name: include configure_redhat_repository_installation.yml
   include: configure_redhat_repository_installation.yml
   when:
     - ceph_origin == 'repository'
 
-- name: configure redhat local installation
+- name: include configure_redhat_local_installation.yml
   include: configure_redhat_local_installation.yml
   when:
     - ceph_origin == 'local'
 
-- name: install redhat packages
+- name: include install_redhat_packages.yml
   include: install_redhat_packages.yml
   when:
     - (ceph_origin == 'repository' or ceph_origin == 'distro')
index 9d7c6c0c6fad174563598bae790c4410f672b5d9..e76e011fdd4d38e60c14eeece2b0dd4430759882 100644 (file)
@@ -4,14 +4,16 @@
     name: "{{ item }}"
     state: present
   with_items: "{{ redhat_package_dependencies }}"
-  when: ansible_distribution == "RedHat"
+  when:
+    - ansible_distribution == 'RedHat'
 
 - name: install centos dependencies
   package:
     name: "{{ item }}"
     state: present
   with_items: "{{ centos_package_dependencies }}"
-  when: ansible_distribution == "CentOS"
+  when:
+    - ansible_distribution == 'CentOS'
 
 - name: install redhat ceph-common
   package:
   package:
     name: ceph-test
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: ceph_test
+  when:
+    - ceph_test
 
 - name: install redhat ceph-radosgw package
   package:
     name: ceph-radosgw
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: rgw_group_name in group_names
+  when:
+    - rgw_group_name in group_names
 
 - name: install redhat nfs-ganesha-ceph package
   package:
index e1af075974250f7f74a5a8dbaad83cdecd9ed019..5a893213731ce8e30a3a9d5c9f829f324518f935 100644 (file)
@@ -5,7 +5,8 @@
   failed_when: false
   register: rhcs_mon_repo
   always_run: true
-  when: mon_group_name in group_names
+  when:
+    - mon_group_name in group_names
 
 - name: enable red hat storage monitor repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms
@@ -20,7 +21,8 @@
   failed_when: false
   register: rhcs_osd_repo
   always_run: true
-  when: osd_group_name in group_names
+  when:
+    - osd_group_name in group_names
 
 - name: enable red hat storage osd repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-osd-rpms
@@ -35,7 +37,8 @@
   failed_when: false
   register: rhcs_rgw_mds_repo
   always_run: true
-  when: (rgw_group_name in group_names or mds_group_name in group_names)
+  when:
+    - (rgw_group_name in group_names or mds_group_name in group_names)
 
 - name: enable red hat storage rados gateway / mds repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms
index 4df13befff61c935c6008a09dba464a8278d9b95..25aa6e00486ff7d7008f739998541a03d42722ae 100644 (file)
@@ -9,21 +9,24 @@
     repo: "deb {{ ceph_rhcs_cdn_debian_repo }}/2-updates/MON {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main"
     state: present
   changed_when: false
-  when: mon_group_name in group_names
+  when:
+    - mon_group_name in group_names
 
 - name: enable red hat storage osd repository for debian systems
   apt_repository:
     repo: "deb {{ ceph_rhcs_cdn_debian_repo }}/2-updates/OSD {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main"
     state: present
   changed_when: false
-  when: osd_group_name in group_names
+  when:
+    - osd_group_name in group_names
 
 - name: enable red hat storage rados gateway / mds repository for debian systems
   apt_repository:
     repo: "deb {{ ceph_rhcs_cdn_debian_repo }}/2-updates/Tools {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main"
     state: present
   changed_when: false
-  when: (rgw_group_name in group_names or mds_group_name in group_names)
+  when:
+    - (rgw_group_name in group_names or mds_group_name in group_names)
 
 - name: enable red hat storage agent repository for debian systems
   apt_repository:
index 302abc519fe905a4b04d15824af1ccba09c5e979..b8a20394e9063019f54457c2d002e09af45c38ce 100644 (file)
@@ -12,7 +12,8 @@
     path: "{{ ceph_rhcs_iso_path | dirname }}"
     state: directory
     recurse: yes
-  when: "'{{ ceph_rhcs_iso_path | dirname }}' != '/'"
+  when:
+    - ceph_rhcs_iso_path | dirname != '/'
 
 - name: fetch the red hat storage iso from the ansible server
   copy:
index 40e07d828a07645199b3afd010124af764401f27..3fdac2b057f1ce18534a8375daf3badff84705a1 100644 (file)
@@ -1,8 +1,10 @@
 ---
-- include: prerequisite_rhcs_iso_install.yml
+- name: include prerequisite_rhcs_iso_install.yml
+  include: prerequisite_rhcs_iso_install.yml
   when:
     - ceph_repository_type == 'iso'
 
-- include: prerequisite_rhcs_cdn_install.yml
+- name: include prerequisite_rhcs_cdn_install.yml
+  include: prerequisite_rhcs_cdn_install.yml
   when:
     - ceph_repository_type == 'cdn'
index 59cdb62746a281030b0281b6c0d024ea6df1f23a..7658530471e3c64ee131b2a49ddde46214613606 100644 (file)
@@ -1,18 +1,26 @@
 ---
-- include: ./checks/check_system.yml
-- include: ./checks/check_mandatory_vars.yml
+- name: include checks/check_system.yml
+  include: checks/check_system.yml
 
-- include: ./checks/check_firewall.yml
-  when: check_firewall
+- name: include checks/check_mandatory_vars.yml
+  include: checks/check_mandatory_vars.yml
+
+- name: include checks/check_firewall.yml
+  include: checks/check_firewall.yml
+  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
-  when: osd_group_name in group_names
+- name: include misc/system_tuning.yml
+  include: misc/system_tuning.yml
+  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: ./installs/install_on_redhat.yml
+- name: include installs/install_on_redhat.yml
+  include: installs/install_on_redhat.yml
   when:
     - ansible_os_family == 'RedHat'
   tags:
@@ -20,7 +28,8 @@
   # 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
+- name: include installs/install_on_debian.yml
+  include: installs/install_on_debian.yml
   when:
     - ansible_os_family == 'Debian'
   tags:
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- include: ./installs/install_on_clear.yml
-  when: ansible_os_family == 'ClearLinux'
+- name: include installs/install_on_clear.yml
+  include: installs/install_on_clear.yml
+  when:
+    - ansible_os_family == 'ClearLinux'
   tags:
     - 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
+- name: include misc/ntp_redhat.yml
+  include: misc/ntp_redhat.yml
   when:
     - ansible_os_family == 'RedHat'
     - 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
+- name: include misc/ntp_debian.yml
+  include: misc/ntp_debian.yml
   when:
     - ansible_os_family == 'Debian'
     - ntp_service_enabled
   always_run: yes
   register: ceph_version
 
-- set_fact:
+- name: set_fact ceph_version
+  set_fact:
     ceph_version: "{{ ceph_version.stdout.split(' ')[2] }}"
 
 # override ceph_stable_release for ceph_dev and rhcs installations since ceph_stable_release is not mandatory
-- include: ./release-rhcs.yml
+- name: include release-rhcs.yml
+  include: release-rhcs.yml
   when:
     - ceph_repository in ['rhcs', 'dev']
   tags:
     - always
 
-- include: facts_mon_fsid.yml
+- name: include facts_mon_fsid.yml
+  include: facts_mon_fsid.yml
   run_once: true
   when:
     - cephx
     - ceph_current_fsid.rc == 0
     - mon_group_name in group_names
 
-- include: create_ceph_initial_dirs.yml
-- include: create_rbd_client_dir.yml
-- include: configure_cluster_name.yml
+- name: include create_ceph_initial_dirs.yml
+  include: create_ceph_initial_dirs.yml
+
+- name: include create_rbd_client_dir.yml
+  include: create_rbd_client_dir.yml
+
+- name: include configure_cluster_name.yml
+  include: configure_cluster_name.yml
index 11dfc988e6e32cc34c6d4d1a692a8abdfa24bd77..4da8abe843815f84e9f08196f075220c473a54fe 100644 (file)
@@ -1,6 +1,8 @@
 ---
-- include: ../checks/check_ntp_atomic.yml
-  when: is_atomic
+- name: include ../checks/check_ntp_atomic.yml
+  include: ../checks/check_ntp_atomic.yml
+  when:
+    - is_atomic
 
 - name: start the ntp service
   service:
index 62db3469cc4c8b0e047d468c638847cfc1f7ab57..7eab2e410fd448cc561f54b9363249d95e694864 100644 (file)
@@ -1,6 +1,8 @@
 ---
-- include: ../checks/check_ntp_debian.yml
-  when: ansible_os_family == 'Debian'
+- name: include ../checks/check_ntp_debian.yml
+  include: ../checks/check_ntp_debian.yml
+  when:
+    - ansible_os_family == 'Debian'
 
 - name: start the ntp service
   service:
index b64b9d8cd4834d62de26448cda7347a58e6b36c2..332841b9c78f8b1317938f66a6fb4d43b2fae658 100644 (file)
@@ -1,6 +1,8 @@
 ---
-- include: ../checks/check_ntp_redhat.yml
-  when: ansible_os_family == 'RedHat'
+- name: include ../checks/check_ntp_redhat.yml
+  include: ../checks/check_ntp_redhat.yml
+  when:
+    - ansible_os_family == 'RedHat'
 
 - name: start the ntp service
   service:
index 9ae92732e1c374413dc59e0cf6c214ea09106120..0aeced9ffc3343e65d95428afc607af01e513aee 100644 (file)
@@ -3,6 +3,8 @@
   command: updatedb -e /var/lib/ceph
   changed_when: false
   failed_when: false
+  when:
+    - osd_objectstore == 'filestore'
 
 - name: create tmpfiles.d directory
   file:
@@ -12,7 +14,8 @@
     group: "root"
     mode: "0755"
   register: "tmpfiles_d"
-  when: disable_transparent_hugepage
+  when:
+    - disable_transparent_hugepage
 
 - name: disable transparent hugepage
   template:
@@ -23,7 +26,8 @@
     mode: "0644"
     force: "yes"
     validate: "systemd-tmpfiles --create %s"
-  when: disable_transparent_hugepage
+  when:
+    - disable_transparent_hugepage
 
 - name: get default vm.min_free_kbytes
   command: sysctl -b vm.min_free_kbytes
@@ -32,7 +36,7 @@
   always_run: yes
   register: default_vm_min_free_kbytes
 
-- name: define vm.min_free_kbytes
+- name: set_fact vm_min_free_kbytes
   set_fact:
     vm_min_free_kbytes: "{{ 4194303 if ansible_memtotal_mb >= 49152 else default_vm_min_free_kbytes.stdout }}"
 
index b6054e3934020ca58962f93d8b3bc81d2b87565f..304c6d30c2a9a5a0f59e4ae6e261a7b4a314a1f8 100644 (file)
@@ -1,16 +1,24 @@
 ---
-- set_fact:
+- name: set_fact ceph_release jewel
+  set_fact:
     ceph_release: jewel
-  when: ceph_version.split('.')[0] | version_compare('10', '==')
+  when:
+    - ceph_version.split('.')[0] | version_compare('10', '==')
 
-- set_fact:
+- name: set_fact ceph_release kraken
+  set_fact:
     ceph_release: kraken
-  when: ceph_version.split('.')[0] | version_compare('11', '==')
+  when:
+    - ceph_version.split('.')[0] | version_compare('11', '==')
 
-- set_fact:
+- name: set_fact ceph_release luminous
+  set_fact:
     ceph_release: luminous
-  when: ceph_version.split('.')[0] | version_compare('12', '==')
+  when:
+    - ceph_version.split('.')[0] | version_compare('12', '==')
 
-- set_fact:
+- name: set_fact ceph_release mimic
+  set_fact:
     ceph_release: mimic
-  when: ceph_version.split('.')[0] | version_compare('13', '==')
+  when:
+    - ceph_version.split('.')[0] | version_compare('13', '==')
index e4ec2b4e4b67d53ca3669a4515af1ed73a4326ce..3ecf5d9e7261e9fd3ba350bb660bbffb6c9e2511 100644 (file)
@@ -52,7 +52,8 @@
       - restart ceph mdss
       - restart ceph rgws
       - restart ceph nfss
-  when: not containerized_deployment|bool
+  when:
+    - not containerized_deployment|bool
 
 # ceph-docker-common
 # only create fetch directory when:
@@ -78,7 +79,8 @@
       creates="{{ fetch_directory }}/ceph_cluster_uuid.conf"
     register: cluster_uuid
     become: false
-    when: generate_fsid
+    when:
+      - generate_fsid
 
   - name: read cluster uuid if it already exists
     local_action: command cat {{ fetch_directory }}/ceph_cluster_uuid.conf
@@ -87,7 +89,8 @@
     register: cluster_uuid
     always_run: true
     become: false
-    when: generate_fsid
+    when:
+      - generate_fsid
 
   - name: ensure /etc/ceph exists
     file:
@@ -96,7 +99,8 @@
       owner: 'ceph'
       group: 'ceph'
       mode: 0755
-    when: groups.get(mon_group_name, []) | length == 0
+    when:
+      - groups.get(mon_group_name, []) | length == 0
 
   - name: "generate {{ cluster }}.conf configuration file"
     action: config_template
   - name: set fsid fact when generate_fsid = true
     set_fact:
       fsid: "{{ cluster_uuid.stdout }}"
-    when: generate_fsid
-  when: containerized_deployment|bool
+    when:
+      - generate_fsid
+  when:
+    - containerized_deployment|bool
index 91a533b65d0c01ab9473fd7256248f1151bc8302..4389952d2b7eb00165166a91765121d1b88a8841 100644 (file)
@@ -2,7 +2,8 @@
 - name: update apt cache
   apt:
     update-cache: yes
-  when: ansible_os_family == 'Debian'
+  when:
+    - ansible_os_family == 'Debian'
 
 - block:
   - name: copy mon restart script
index 78e961bdfdae547337e0d6f0d77223fa31c64703..8dcad149b3b64c28d64079dc99050aca3c2868ef 100644 (file)
@@ -1,11 +1,15 @@
 ---
-- set_fact:
+- name: set_fact monitor_name ansible_hostname
+  set_fact:
     monitor_name: "{{ ansible_hostname }}"
-  when: not mon_use_fqdn
+  when:
+    - not mon_use_fqdn
 
-- set_fact:
+- name: set_fact monitor_name ansible_fqdn
+  set_fact:
     monitor_name: "{{ ansible_fqdn }}"
-  when: mon_use_fqdn
+  when:
+    - mon_use_fqdn
 
 # this task shouldn't run in a rolling_update situation
 # because it blindly picks a mon, which may be down because
@@ -30,7 +34,8 @@
 
 # set this as a default when performing a rolling_update
 # so the rest of the tasks here will succeed
-- set_fact:
+- name: set_fact ceph_current_fsid rc 1
+  set_fact:
     ceph_current_fsid:
       rc: 1
   when:
   changed_when: false
   become: false
   run_once: true
-  when: cephx or generate_fsid
+  when:
+    - (cephx or generate_fsid)
 
-- set_fact:
+- name: set_fact fsid ceph_current_fsid.stdout
+  set_fact:
     fsid: "{{ ceph_current_fsid.stdout }}"
   when:
     - ceph_current_fsid.rc == 0
 
 # Set ceph_release to ceph_stable by default
-- set_fact:
+- name: set_fact ceph_release ceph_stable_release
+  set_fact:
     ceph_release: "{{ ceph_stable_release }}"
 
 - name: generate cluster fsid
@@ -65,7 +73,8 @@
   local_action: shell echo {{ fsid }} | tee {{ fetch_directory }}/ceph_cluster_uuid.conf
     creates="{{ fetch_directory }}/ceph_cluster_uuid.conf"
   become: false
-  when: ceph_current_fsid.rc == 0
+  when:
+    - ceph_current_fsid.rc == 0
 
 - name: read cluster fsid if it already exists
   local_action: command cat {{ fetch_directory }}/ceph_cluster_uuid.conf
   register: cluster_uuid
   become: false
   always_run: true
-  when: generate_fsid
+  when:
+    - generate_fsid
 
-- name: set fsid fact when generate_fsid = true
+- name: set_fact fsid
   set_fact:
     fsid: "{{ cluster_uuid.stdout }}"
-  when: generate_fsid
+  when:
+    - generate_fsid
 
-- name: set docker_exec_cmd fact
+- name: set_fact docker_exec_cmd
   set_fact:
     docker_exec_cmd: "docker exec ceph-mon-{{ ansible_hostname }}"
-  when: containerized_deployment
+  when:
+    - containerized_deployment
 
-- set_fact:
+- name: set_fact mds_name ansible_hostname
+  set_fact:
     mds_name: "{{ ansible_hostname }}"
-  when: not mds_use_fqdn
+  when:
+    - not mds_use_fqdn
 
-- set_fact:
+- name: set_fact mds_name ansible_fqdn
+  set_fact:
     mds_name: "{{ ansible_fqdn }}"
-  when: mds_use_fqdn
+  when:
+    - mds_use_fqdn
 
-- set_fact:
+- name: set_fact rbd_client_directory_owner ceph
+  set_fact:
     rbd_client_directory_owner: ceph
   when:
     - rbd_client_directory_owner is not defined
       or not rbd_client_directory_owner
 
-- set_fact:
+- name: set_fact rbd_client_directory_group rbd_client_directory_group
+  set_fact:
     rbd_client_directory_group: ceph
   when:
     - rbd_client_directory_group is not defined
       or not rbd_client_directory_group
 
-- set_fact:
+- name: set_fact rbd_client_directory_mode 0770
+  set_fact:
     rbd_client_directory_mode: "0770"
   when:
     - rbd_client_directory_mode is not defined
index 25887efa78ccf42d789864515df5685d01286e39..2efe0594113b135c2397af191b16dc19cf129571 100644 (file)
@@ -1,3 +1,6 @@
 ---
-- include: facts.yml
-- include: check_socket.yml
+- name: include facts.yml
+  include: facts.yml
+
+- name: include check_socket.yml
+  include: check_socket.yml
index 941b96c51455926cfb6ef8a1a0fa228c7be62f4e..bd37f414d2d3b3714ae82138e1b997bb5f1680d5 100644 (file)
@@ -1,5 +1,6 @@
 ---
-- include: stat_ceph_files.yml
+- name: include stat_ceph_files.yml
+  include: stat_ceph_files.yml
 
 - name: fail if we find existing cluster files
   fail:
@@ -7,4 +8,5 @@
   with_together:
     - "{{ ceph_config_keys }}"
     - "{{ statconfig.results }}"
-  when: item.1.stat.exists == true
+  when:
+    - item.1.stat.exists == true
index 7da8f5bee725b70c30281c2f08807fb414768e72..c666958ca5926a8534719c863e81a51915e3124c 100644 (file)
@@ -5,7 +5,8 @@
   ignore_errors: true
   always_run: true
   changed_when: false
-  when: ansible_os_family == 'Debian'
+  when:
+    - ansible_os_family == 'Debian'
 
 - name: install ntp on debian
   package:
index 0e4772f5496eb9123cd35c13f634441062cefadb..2a957b4553a87dd8da66fc896ac372295e7251e2 100644 (file)
@@ -5,7 +5,8 @@
   ignore_errors: true
   always_run: true
   changed_when: false
-  when: ansible_os_family == 'RedHat'
+  when:
+    - ansible_os_family == 'RedHat'
 
 - name: install ntp on redhat
   package:
index c1c756c962a28f55d5107a13b6fdb66214298812..cd186a5c7c6d7d901426b05ae6fcf0aa4c1abf72 100644 (file)
@@ -1,5 +1,6 @@
 ---
-- include: stat_ceph_files.yml
+- name: include stat_ceph_files.yml
+  include: stat_ceph_files.yml
 
 - name: try to fetch ceph config and keys
   copy:
@@ -12,4 +13,5 @@
   with_together:
     - "{{ ceph_config_keys }}"
     - "{{ statconfig.results | default([]) }}"
-  when: item.1.stat.exists == true
+  when:
+    - item.1.stat.exists == true
index 57c76ed859e9cbcf30e916107c9b0e40ac48efb8..69ba821fd5246ef7f091e97eadfe1d71637f4bd8 100644 (file)
@@ -3,24 +3,29 @@
 - name: "pull {{ ceph_docker_image }} image"
   command: "docker pull {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
   changed_when: false
-  when: ceph_docker_dev_image is undefined or not ceph_docker_dev_image
+  when:
+    - (ceph_docker_dev_image is undefined or not ceph_docker_dev_image)
 
 # Dev case - export local dev image and send it across
 - name: export local ceph dev image
   local_action: command docker save -o "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar" "{{ ceph_docker_username }}/{{ ceph_docker_imagename }}:{{ ceph_docker_image_tag }}"
-  when: ceph_docker_dev_image is defined and ceph_docker_dev_image
+  when:
+    - (ceph_docker_dev_image is defined and ceph_docker_dev_image)
   run_once: true
 
 - name: copy ceph dev image file
   copy:
     src: "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
     dest: "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
-  when: ceph_docker_dev_image is defined and ceph_docker_dev_image
+  when:
+    - (ceph_docker_dev_image is defined and ceph_docker_dev_image)
 
 - name: load ceph dev image
   command: "docker load -i /tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
-  when: ceph_docker_dev_image is defined and ceph_docker_dev_image
+  when:
+    - (ceph_docker_dev_image is defined and ceph_docker_dev_image)
 
 - name: remove tmp ceph dev image file
   command: "rm /tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
-  when: ceph_docker_dev_image is defined and ceph_docker_dev_image
+  when:
+    - (ceph_docker_dev_image is defined and ceph_docker_dev_image)
index 24f76b2a760f59435a1170533286682ee686e776..f70c8e752d4fdcb907cacaf2777e675fc080b342 100644 (file)
@@ -1,26 +1,34 @@
 ---
-- include: system_checks.yml
+- name: include system_checks.yml
+  include: system_checks.yml
 
 - name: check if it is atomic host
-  stat: path=/run/ostree-booted
+  stat:
+    path: /run/ostree-booted
   register: stat_ostree
   always_run: true
 
-- name: set fact for using atomic host
+- name: set_fact is_atomic
   set_fact:
     is_atomic: '{{ stat_ostree.stat.exists }}'
 
-- include: ./pre_requisites/prerequisites.yml
-  when: not is_atomic
+- name: include pre_requisites/prerequisites.yml
+  include: pre_requisites/prerequisites.yml
+  when:
+    - not is_atomic
 
 # NOTE(guits): would be nice to refact this block with L39-45 in roles/ceph-common/tasks/facts.yml
-- set_fact:
+- name: set_fact monitor_name ansible_hostname
+  set_fact:
     monitor_name: "{{ ansible_hostname }}"
-  when: not mon_use_fqdn
+  when:
+    - not mon_use_fqdn
 
-- set_fact:
+- name: set_fact monitor_name ansible_fqdn
+  set_fact:
     monitor_name: "{{ ansible_fqdn }}"
-  when: mon_use_fqdn
+  when:
+    - mon_use_fqdn
 
 - name: get docker version
   command: docker --version
@@ -28,7 +36,8 @@
   always_run: yes
   register: docker_version
 
-- set_fact:
+- name: set_fact docker_version docker_version.stdout.split
+  set_fact:
     docker_version: "{{ docker_version.stdout.split(' ')[2] }}"
 
 - name: check if a cluster is already running
@@ -44,7 +53,8 @@
 # a cluster is not already running,
 # AND
 # we are not playing rolling-update.yml playbook.
-- include: checks.yml
+- name: include checks.yml
+  include: checks.yml
   when:
     - (not containerized_deployment_with_kv and
        ((inventory_hostname in groups.get(mon_group_name, [])) or
     - ceph_health.rc != 0
     - not "{{ rolling_update | default(false) }}"
 
-- include: ./misc/ntp_atomic.yml
+- name: include misc/ntp_atomic.yml
+  include: misc/ntp_atomic.yml
   when:
     - is_atomic
     - ansible_os_family == 'RedHat'
     - ntp_service_enabled
 
-- include: ./misc/ntp_redhat.yml
+- name: include misc/ntp_redhat.yml
+  include: misc/ntp_redhat.yml
   when:
     - not is_atomic
     - ansible_os_family == 'RedHat'
     - ntp_service_enabled
 
-- include: ./misc/ntp_debian.yml
+- name: include misc/ntp_debian.yml
+  include: misc/ntp_debian.yml
   when:
     - ansible_os_family == 'Debian'
     - ntp_service_enabled
 
-- include: fetch_image.yml
+- name: include fetch_image.yml
+  include: fetch_image.yml
 
 - name: get ceph version
   command: docker run --entrypoint /usr/bin/ceph {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} --version
   always_run: yes
   register: ceph_version
 
-- set_fact:
+- name: set_fact ceph_version ceph_version.stdout.split
+  set_fact:
     ceph_version: "{{ ceph_version.stdout.split(' ')[2] }}"
 
-- include: release.yml
+- name: include release.yml
+  include: release.yml
 
 # NOTE (jimcurtis): dirs_permissions.yml must precede fetch_configs.yml
 # # because it creates the directories needed by the latter.
-- include: dirs_permissions.yml
+- name: include dirs_permissions.yml
+  include: dirs_permissions.yml
 
-- include: create_configs.yml
+- name: include create_configs.yml
+  include: create_configs.yml
 
-- include: selinux.yml
-  when: ansible_os_family == 'RedHat'
+- name: include selinux.yml
+  include: selinux.yml
+  when:
+    - ansible_os_family == 'RedHat'
index 11dfc988e6e32cc34c6d4d1a692a8abdfa24bd77..b8a7534506777a872eda2e145628811bca029e9a 100644 (file)
@@ -1,5 +1,6 @@
 ---
-- include: ../checks/check_ntp_atomic.yml
+- name: include ../checks/check_ntp_atomic.yml
+  include: ../checks/check_ntp_atomic.yml
   when: is_atomic
 
 - name: start the ntp service
index 62db3469cc4c8b0e047d468c638847cfc1f7ab57..7eab2e410fd448cc561f54b9363249d95e694864 100644 (file)
@@ -1,6 +1,8 @@
 ---
-- include: ../checks/check_ntp_debian.yml
-  when: ansible_os_family == 'Debian'
+- name: include ../checks/check_ntp_debian.yml
+  include: ../checks/check_ntp_debian.yml
+  when:
+    - ansible_os_family == 'Debian'
 
 - name: start the ntp service
   service:
index b64b9d8cd4834d62de26448cda7347a58e6b36c2..332841b9c78f8b1317938f66a6fb4d43b2fae658 100644 (file)
@@ -1,6 +1,8 @@
 ---
-- include: ../checks/check_ntp_redhat.yml
-  when: ansible_os_family == 'RedHat'
+- name: include ../checks/check_ntp_redhat.yml
+  include: ../checks/check_ntp_redhat.yml
+  when:
+    - ansible_os_family == 'RedHat'
 
 - name: start the ntp service
   service:
index 4296d55653d647cff2949857c2932635e9bbc455..02dd814d642aacd617bb00d80fdf027fdfaf2f82 100644 (file)
@@ -1,8 +1,11 @@
 ---
-- include: remove_ceph_udev_rules.yml
+- name: include remove_ceph_udev_rules.yml
+  include: remove_ceph_udev_rules.yml
 
-- include: debian_prerequisites.yml
-  when: ansible_distribution == 'Debian'
+- name: include debian_prerequisites.yml
+  include: debian_prerequisites.yml
+  when:
+    - ansible_distribution == 'Debian'
   tags:
     with_pkg
 
@@ -11,7 +14,8 @@
     name: docker.io
     state: present
     update_cache: yes
-  when: ansible_distribution == 'Ubuntu'
+  when:
+    - ansible_distribution == 'Ubuntu'
   tags:
     with_pkg
 
@@ -32,7 +36,8 @@
     name: python-six
     state: present
     update_cache: yes
-  when: ansible_distribution != 'Debian'
+  when:
+    - ansible_distribution != 'Debian'
   tags:
     with_pkg
 
@@ -40,7 +45,8 @@
   package:
     name: python-docker-py
     state: present
-  when: ansible_os_family == 'RedHat'
+  when:
+    - ansible_os_family == 'RedHat'
   tags:
     with_pkg
 
@@ -48,7 +54,8 @@
   package:
     name: python-docker
     state: present
-  when: ansible_distribution == 'Ubuntu'
+  when:
+    - ansible_distribution == 'Ubuntu'
   tags:
     with_pkg
 
   package:
     name: docker
     state: present
-  when: ansible_os_family == 'RedHat'
+  when:
+    - ansible_os_family == 'RedHat'
   tags:
     with_pkg
 
 - name: pause after docker install before starting (on openstack vms)
   pause: seconds=5
-  when: ceph_docker_on_openstack
+  when:
+    - ceph_docker_on_openstack
   tags:
     with_pkg
 
@@ -78,6 +87,7 @@
   package:
     name: ntp
     state: present
-  when: ntp_service_enabled
+  when:
+    - ntp_service_enabled
   tags:
     with_pkg
index b6054e3934020ca58962f93d8b3bc81d2b87565f..304c6d30c2a9a5a0f59e4ae6e261a7b4a314a1f8 100644 (file)
@@ -1,16 +1,24 @@
 ---
-- set_fact:
+- name: set_fact ceph_release jewel
+  set_fact:
     ceph_release: jewel
-  when: ceph_version.split('.')[0] | version_compare('10', '==')
+  when:
+    - ceph_version.split('.')[0] | version_compare('10', '==')
 
-- set_fact:
+- name: set_fact ceph_release kraken
+  set_fact:
     ceph_release: kraken
-  when: ceph_version.split('.')[0] | version_compare('11', '==')
+  when:
+    - ceph_version.split('.')[0] | version_compare('11', '==')
 
-- set_fact:
+- name: set_fact ceph_release luminous
+  set_fact:
     ceph_release: luminous
-  when: ceph_version.split('.')[0] | version_compare('12', '==')
+  when:
+    - ceph_version.split('.')[0] | version_compare('12', '==')
 
-- set_fact:
+- name: set_fact ceph_release mimic
+  set_fact:
     ceph_release: mimic
-  when: ceph_version.split('.')[0] | version_compare('13', '==')
+  when:
+    - ceph_version.split('.')[0] | version_compare('13', '==')
index 01573183c2b53b47c610e2dec1ee98a1325457a8..a94056491f23e88bf4ddfbade1b15f62f91d8c5a 100644 (file)
@@ -1,5 +1,5 @@
 ---
-- name: set config and keys paths
+- name: set_fact ceph_config_keys
   set_fact:
     ceph_config_keys:
       - "{{ ceph_conf_key_directory }}/{{ cluster }}.client.admin.keyring"
@@ -9,30 +9,30 @@
       - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
       - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
 
-- name: register rbd bootstrap key
+- name: set_fact bootstrap_rbd_keyring
   set_fact:
     bootstrap_rbd_keyring:
       - "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
   when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
 
-- name: merge rbd bootstrap key to config and keys paths
+- name: set_fact ceph_config_keys ceph_config_keys + bootstrap_rbd_keyring
   set_fact:
     ceph_config_keys: "{{ ceph_config_keys + bootstrap_rbd_keyring }}"
   when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
 
-- name: add mgr keys to config and keys paths
+- name: set_fact tmp_ceph_mgr_keys add mgr keys to config and keys paths
   set_fact:
     tmp_ceph_mgr_keys: "{{ ceph_conf_key_directory }}/{{ cluster }}.mgr.{{ hostvars[item]['ansible_hostname'] }}.keyring"
   with_items: "{{ groups.get(mgr_group_name, []) }}"
   register: tmp_ceph_mgr_keys_result
   when: groups.get(mgr_group_name, []) | length > 0
 
-- name: convert mgr keys to an array
+- name: set_fact ceph_mgr_keys convert mgr keys to an array
   set_fact:
     ceph_mgr_keys: "{{ tmp_ceph_mgr_keys_result.results | map(attribute='ansible_facts.tmp_ceph_mgr_keys') | list }}"
   when: groups.get(mgr_group_name, []) | length > 0
 
-- name: merge mgr keys to config and keys paths
+- name: set_fact ceph_config_keys merge mgr keys to config and keys paths
   set_fact:
     ceph_config_keys: "{{ ceph_config_keys + ceph_mgr_keys }}"
   when: groups.get(mgr_group_name, []) | length > 0
index ecce0028f058cc92c4520ff6842bbaae3b134ee7..917c42b2c8e2ad1364d147d27975d284a4486633 100644 (file)
@@ -14,7 +14,7 @@
   with_items:
     - "{{ ceph_keys.stdout_lines }}"
 
-- name: register rbd bootstrap key
+- name: set_fact bootstrap_rbd_keyring
   set_fact:
     bootstrap_rbd_keyring: "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
   when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
index 0665f0a7f4dc33b9ff5dfa38acfa424f8e6db5a1..f3d4989a7eb6f06d58a9b687c26dbe7fbf24bac9 100644 (file)
@@ -1,5 +1,5 @@
 ---
-- name: set crt path(s)
+- name: set_fact crt_files
   set_fact:
     crt_files:
       - "/etc/ceph/iscsi-gateway.crt"
@@ -28,7 +28,8 @@
     - "{{ crt_files_exist.results }}"
   when: item.1.stat.exists == true
 
-- include: generate_crt.yml
+- name: include generate_crt.yml
+  include: generate_crt.yml
   with_together:
     - "{{ crt_files }}"
     - "{{ crt_files_exist.results }}"
index 87102c52337e73c40bbad6c92cf5f7adb91ca702..ade5fe2c7e3599011243d67874bf1c09d290c59f 100644 (file)
@@ -1,8 +1,12 @@
 ---
-- include: prerequisites.yml
+- name: include prerequisites.yml
+  include: prerequisites.yml
 
 # deploy_ssl_keys used the ansible controller to create self-signed crt/key/pub files
 # and transfers them to /etc/ceph directory on each controller. SSL certs are used by
 # the API for https support.
-- include: deploy_ssl_keys.yml
-- include: configure_iscsi.yml
+- name: include deploy_ssl_keys.yml
+  include: deploy_ssl_keys.yml
+
+- name: configure_iscsi.yml
+  include: configure_iscsi.yml
index 074f8781b8876a7b6540249ea932ba1de6d2f7ca..62c6ec3bc00c84fba1ebe4a30d43fc496d8d6b8b 100644 (file)
@@ -1,5 +1,5 @@
 ---
-- name: set config and keys paths
+- name: set_fact ceph_config_keys
   set_fact:
     ceph_config_keys:
       - /etc/ceph/{{ cluster }}.conf
index 4a45f03d4526c2bface1434e5c168e0bf7931b21..969388fcf425dadf12eb294d5364920ac1a9dc20 100644 (file)
@@ -1,8 +1,13 @@
 ---
-- name: set docker_exec_cmd fact
+- name: set_fact docker_exec_cmd
   set_fact:
     docker_exec_cmd: "docker exec ceph-mds-{{ ansible_hostname }}"
 
-- include: copy_configs.yml
-- include: start_docker_mds.yml
-- include: enable_multimds.yml
+- name: include copy_configs.yml
+  include: copy_configs.yml
+
+- name: include start_docker_mds.yml
+  include: start_docker_mds.yml
+
+- name: include enable_multimds.yml
+  include: enable_multimds.yml
index 1c0b8c6153684d7ec37289581a88cdcc4360ba15..5df5e21630d48eed2258b2ad52bdc366e60f4266 100644 (file)
@@ -1,6 +1,8 @@
 ---
-- include: pre_requisite.yml
+- name: include pre_requisite.yml
+  include: pre_requisite.yml
   when: not containerized_deployment
 
-- include: ./docker/main.yml
+- name: docker/main.yml
+  include: docker/main.yml
   when: containerized_deployment
index 0d3822c0308cb14d7f3600bdcc61670a58343e38..8ce8b64a05ed6e96b3fbea4a27d9d3072f7dcf77 100644 (file)
@@ -1,5 +1,5 @@
 ---
-- name: set config and keys paths
+- name: set_fact ceph_config_keys
   set_fact:
     ceph_config_keys:
       - /etc/ceph/{{ cluster }}.conf
index 81590ce01cf2b33b2aeee62ad315e85f38a0bd86..b350bcd879f5d3531c09420622dbbcb8ee46a1a2 100644 (file)
@@ -15,5 +15,8 @@
     group: "root"
     mode: "0755"
 
-- include: copy_configs.yml
-- include: start_docker_mgr.yml
+- name: include copy_configs.yml
+  include: copy_configs.yml
+
+- name: include start_docker_mgr.yml
+  include: start_docker_mgr.yml
index 1c0b8c6153684d7ec37289581a88cdcc4360ba15..f2b42763cab57e6aa5a0fce2017182fc1d7050ca 100644 (file)
@@ -1,6 +1,8 @@
 ---
-- include: pre_requisite.yml
+- name: include pre_requisite.yml
+  include: pre_requisite.yml
   when: not containerized_deployment
 
-- include: ./docker/main.yml
+- name: include docker/main.yml
+  include: docker/main.yml
   when: containerized_deployment
index 4677e950c441b75884e3c33f030078c1e0ae188a..f8e779b2faeb24a56bb1d1139386407455df42c8 100644 (file)
     - ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel
   with_items: "{{ groups.get(mgr_group_name, []) }}"
 
-- include: set_osd_pool_default_pg_num.yml
+- name: include set_osd_pool_default_pg_num.yml
+  include: set_osd_pool_default_pg_num.yml
 
-- include: crush_rules.yml
+- name: crush_rules.yml
+  include: crush_rules.yml
   when:
     - crush_rule_config
 
   failed_when: false
   register: rbd_pool_exist
 
-- include: rbd_pool.yml
+- name: include rbd_pool.yml
+  include: rbd_pool.yml
   when: rbd_pool_exist.rc == 0
 
-- include: rbd_pool_pgs.yml
+- name: include rbd_pool_pgs.yml
+  include: rbd_pool_pgs.yml
   when:
     - rbd_pool_exist.rc == 0
     - global_in_ceph_conf_overrides
     - ceph_conf_overrides.global.osd_pool_default_pg_num is defined
 
-- include: rbd_pool_size.yml
+- name: include rbd_pool_size.yml
+  include: rbd_pool_size.yml
   when:
     - rbd_pool_exist.rc == 0
     - global_in_ceph_conf_overrides
     - ceph_conf_overrides.global.osd_pool_default_pg_num is defined
     - rbd_pool_exist.rc != 0
 
-- include: openstack_config.yml
+- name: include openstack_config.yml
+  include: openstack_config.yml
   when:
     - openstack_config
-    - "{{ inventory_hostname == groups[mon_group_name] | last }}"
+    - inventory_hostname == groups[mon_group_name] | last
 
 - name: find ceph keys
   shell: ls -1 /etc/ceph/*.keyring
   changed_when: false
   register: ceph_keys
   always_run: true
-  when: cephx
+  when:
+    - cephx
 
 - name: set keys permissions
   file:
     mode: "0600"
   with_items:
     - "{{ ceph_keys.get('stdout_lines') | default([]) }}"
-  when: cephx
+  when:
+    - cephx
 
-- name: register rbd bootstrap key
+- name: set_fact bootstrap_rbd_keyring
   set_fact:
     bootstrap_rbd_keyring: "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
-  when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
+  when:
+    - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
 
 - name: copy keys to the ansible server
   fetch:
     - "{{ bootstrap_rbd_keyring | default([]) }}"
   when:
     - cephx
-    - "{{ inventory_hostname == groups[mon_group_name] | last }}"
+    - inventory_hostname == groups[mon_group_name] | last
 
 - name: drop in a motd script to report status when logging in
   copy:
     owner: root
     group: root
     mode: 0755
-  when: ansible_distribution_release == 'precise'
+  when:
+    - ansible_distribution_release == 'precise'
index 2c5d3c5a736ccc514f35d7b8959512c03f9c4d59..4bb7831325d805097c87b3b3a4c8047a42f253c9 100644 (file)
@@ -21,7 +21,7 @@
   with_items: "{{ crush_rules }}"
   when: item.default
 
-- name: set crush rule info as fact
+- name: set_fact info_ceph_default_crush_rule_yaml
   set_fact:
     info_ceph_default_crush_rule_yaml: "{{ info_ceph_default_crush_rule.results[0].stdout|from_json() }}"
   when: info_ceph_default_crush_rule.results|length > 0
index df170065b68afd9a7f10e87448a88edce0fbef9d..c4706e37e5a262892bb5f6369e576f7d743f318e 100644 (file)
     mode: "0755"
     recurse: true
 
-- set_fact:
+- name: set_fact ceph_authtool_cap >= ceph_release_num.luminous
+  set_fact:
     ceph_authtool_cap: "--cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow' --cap mgr 'allow *'"
   when:
     - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
     - cephx
     - admin_secret != 'admin_secret'
 
-- set_fact:
+- name: set_fact ceph_authtool_cap < ceph_release_num.luminous
+  set_fact:
     ceph_authtool_cap: "--cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow'"
   when:
     - ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous
index 4121743c4c783cb38fadc6921c267c45f9d8d74c..123dc36d9eb0f9fa84d3ba28926e2ed3022c291e 100644 (file)
@@ -1,5 +1,5 @@
 ---
-- name: set config and keys paths
+- name: set_fact ceph_config_keys
   set_fact:
     ceph_config_keys:
       - /etc/ceph/{{ cluster }}.conf
       - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
       - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
 
-- name: add mgr keys to config and keys paths
+- name: set_fact tmp_ceph_mgr_keys add mgr keys to config and keys paths
   set_fact:
     tmp_ceph_mgr_keys: /etc/ceph/{{ cluster }}.mgr.{{ hostvars[item]['ansible_hostname'] }}.keyring
   with_items: "{{ groups.get(mgr_group_name, []) }}"
   register: tmp_ceph_mgr_keys_result
-  when: "{{ groups.get(mgr_group_name, []) | length > 0 }}"
+  when:
+    - groups.get(mgr_group_name, []) | length > 0
 
-- name: convert mgr keys to an array
+- name: set_fact ceph_mgr_keys convert mgr keys to an array
   set_fact:
     ceph_mgr_keys: "{{ tmp_ceph_mgr_keys_result.results | map(attribute='ansible_facts.tmp_ceph_mgr_keys') | list }}"
-  when: "{{ groups.get(mgr_group_name, []) | length > 0 }}"
+  when:
+    - groups.get(mgr_group_name, []) | length > 0
 
-- name: merge mgr keys to config and keys paths
+- name: set_fact ceph_config_keys merge mgr keys to config and keys paths
   set_fact:
     ceph_config_keys: "{{ ceph_config_keys + ceph_mgr_keys }}"
-  when: "{{ groups.get(mgr_group_name, []) | length > 0 }}"
+  when:
+    - groups.get(mgr_group_name, []) | length > 0
 
 - name: stat for ceph config and keys
   local_action: stat path={{ fetch_directory }}/{{ fsid }}/{{ item }}
@@ -47,7 +50,8 @@
   with_together:
     - "{{ ceph_config_keys }}"
     - "{{ statconfig.results }}"
-  when: item.1.stat.exists == true
+  when:
+    - item.1.stat.exists == true
 
 - name: set selinux permissions
   shell: |
@@ -56,4 +60,5 @@
     - "{{ ceph_conf_key_directory }}"
     - /var/lib/ceph
   changed_when: false
-  when: sestatus.stdout != 'Disabled'
+  when:
+    - sestatus.stdout != 'Disabled'
index 6702cb09d44d15e091ac3c5b03d5dcc25c1005c6..3f740516cb94ad88635437d03e03faf7ba64ec83 100644 (file)
@@ -1,8 +1,10 @@
 ---
-- include: copy_configs.yml
+- name: include copy_configs.yml
+  include: copy_configs.yml
   when: not containerized_deployment_with_kv
 
-- include: start_docker_monitor.yml
+- name: include start_docker_monitor.yml
+  include: start_docker_monitor.yml
 
 - name: wait for monitor socket to exist
   command: docker exec ceph-mon-{{ ansible_hostname }} stat /var/run/ceph/{{ cluster }}-mon.{{ monitor_name }}.asok
@@ -71,7 +73,8 @@
     - hostvars[groups[mon_group_name][0]]['monitor_address_block'] is defined
     - hostvars[groups[mon_group_name][0]]['monitor_address_block'] | length > 0
 
-- include: ./fetch_configs.yml
+- name: include fetch_configs.yml
+  include: fetch_configs.yml
   when: not containerized_deployment_with_kv
 
 - name: create ceph rest api keyring when mon is containerized
     - "{{ inventory_hostname == groups[mon_group_name] | last }}"
     - not containerized_deployment_with_kv
 
-- include: "{{ lookup('env', 'ANSIBLE_ROLES_PATH') | default (playbook_dir + '/roles', true) }}/ceph-mon/tasks/set_osd_pool_default_pg_num.yml"
+- name: include ceph-mon/tasks/set_osd_pool_default_pg_num.yml
+  include: "{{ lookup('env', 'ANSIBLE_ROLES_PATH') | default (playbook_dir + '/roles', true) }}/ceph-mon/tasks/set_osd_pool_default_pg_num.yml"
 
 # create openstack pools only when all mons are up.
-- include: "{{ lookup('env', 'ANSIBLE_ROLES_PATH') | default (playbook_dir + '/roles', true) }}/ceph-mon/tasks/openstack_config.yml"
+- name: include ceph-mon/tasks/set_osd_pool_default_pg_num.yml
+  include: "{{ lookup('env', 'ANSIBLE_ROLES_PATH') | default (playbook_dir + '/roles', true) }}/ceph-mon/tasks/openstack_config.yml"
   when:
     - openstack_config
     - "{{ inventory_hostname == groups[mon_group_name] | last }}"
index 4f0fed6b0fbbd086d14b49555dd15259617cc2a6..1817f06b738b9e36da8866c95f62c0b09b6df7a8 100644 (file)
@@ -1,31 +1,39 @@
 ---
-- include: check_mandatory_vars.yml
+- name: include check_mandatory_vars.yml
+  include: check_mandatory_vars.yml
 
-- include: deploy_monitors.yml
+- name: include deploy_monitors.yml
+  include: deploy_monitors.yml
   when: not containerized_deployment
 
-- include: start_monitor.yml
+- name: include start_monitor.yml
+  include: start_monitor.yml
   when: not containerized_deployment
 
-- include: ceph_keys.yml
+- name: include ceph_keys.yml
+  include: ceph_keys.yml
   when: not containerized_deployment
   # this avoids the bug mentioned here: https://github.com/ansible/ansible/issues/18206
   static: no
 
-- include: create_mds_filesystems.yml
+- name: include create_mds_filesystems.yml
+  include: create_mds_filesystems.yml
   when:
     - not containerized_deployment
     - groups[mds_group_name] is defined
     - "{{ groups[mds_group_name]|length > 0 }}"
     - "{{ inventory_hostname == groups[mon_group_name] | last }}"
 
-- include: secure_cluster.yml
+- name: include secure_cluster.yml
+  include: secure_cluster.yml
   when:
     - secure_cluster
     - not containerized_deployment
 
-- include: ./docker/main.yml
+- name: include docker/main.yml
+  include: docker/main.yml
   when: containerized_deployment
 
-- include: calamari.yml
+- name: include calamari.yml
+  include: calamari.yml
   when: calamari
index e873410ab3c67f31558963c51a9eb31f190f2c8b..e0dd25249bbcb60645ddcbf800a0fe21b8a815c4 100644 (file)
   register: default_pool_default_pg_num
   when: pool_default_pg_num is not defined or not global_in_ceph_conf_overrides
 
-- set_fact:
+- name: set_fact osd_pool_default_pg_num pool_default_pg_num
+  set_fact:
     osd_pool_default_pg_num: "{{ pool_default_pg_num }}"
   when: pool_default_pg_num is defined
 
-- set_fact:
+- name: set_fact osd_pool_default_pg_num default_pool_default_pg_num.stdout
+  set_fact:
     osd_pool_default_pg_num: "{{ default_pool_default_pg_num.stdout }}"
   when:
     - pool_default_pg_num is not defined
     - default_pool_default_pg_num.rc == 0
     - (osd_pool_default_pg_num_in_overrides is not defined or not osd_pool_default_pg_num_in_overrides)
 
-- set_fact:
+- name: set_fact osd_pool_default_pg_num ceph_conf_overrides.global.osd_pool_default_pg_num
+  set_fact:
     osd_pool_default_pg_num: "{{ ceph_conf_overrides.global.osd_pool_default_pg_num }}"
   when:
     - global_in_ceph_conf_overrides
index 4bc05c95ade93e998c4198a42aff1041a3d24956..dbf56263bd6fb3076da45c31d1b121b525964de1 100644 (file)
@@ -1,9 +1,11 @@
 ---
-# Copy Ceph configs to host
-- include: copy_configs.yml
-# Copy Ganesha Ceph configs to host
-- include: copy_ganesha_configs.yml
+- name: include copy_configs.yml
+  include: copy_configs.yml
+
+- name: copy_ganesha_configs.yml
+  include: copy_ganesha_configs.yml
   when: not containerized_deployment_with_kv
 
-- include: start_docker_nfs.yml
+- name: start_docker_nfs.yml
+  include: start_docker_nfs.yml
 
index 1c0b8c6153684d7ec37289581a88cdcc4360ba15..f2b42763cab57e6aa5a0fce2017182fc1d7050ca 100644 (file)
@@ -1,6 +1,8 @@
 ---
-- include: pre_requisite.yml
+- name: include pre_requisite.yml
+  include: pre_requisite.yml
   when: not containerized_deployment
 
-- include: ./docker/main.yml
+- name: include docker/main.yml
+  include: docker/main.yml
   when: containerized_deployment
index 665345097853753d6f7bb59d10155fd1be06587d..3d002f07dd6a2ad5a6d53863cc398fc12a909ab8 100644 (file)
     owner: "ceph"
     group: "ceph"
     mode: "0600"
-  when: cephx
+  when:
+    - cephx
 
 - name: create rgw nfs user
   command: radosgw-admin --cluster {{ cluster }} user create --uid={{ ceph_nfs_rgw_user }} --display-name="RGW NFS User"
   register: rgwuser
   delegate_to: "{{ groups[mon_group_name][0] }}"
-  when: nfs_obj_gw
+  when:
+    - nfs_obj_gw
 
-- name: set access key
+- name: set_fact ceph_nfs_rgw_access_key
   set_fact:
     ceph_nfs_rgw_access_key: "{{ (rgwuser.stdout | from_json)['keys'][0]['access_key'] }}"
   delegate_to: "{{ groups[mon_group_name][0] }}"
@@ -60,7 +62,7 @@
     - nfs_obj_gw
     - ceph_nfs_rgw_access_key is not defined
 
-- name: set secret key
+- name: set_fact ceph_nfs_rgw_secret_key
   set_fact:
     ceph_nfs_rgw_secret_key: "{{(rgwuser.stdout | from_json)['keys'][0]['secret_key']}}"
   delegate_to: "{{ groups[mon_group_name][0] }}"
index 381048a2c73e5617a85d3df60c5097d452ddc27e..2fd449ed1fd3404f5fb05e431efd6b97844bd8a8 100644 (file)
@@ -25,7 +25,7 @@
 
 # NOTE (leseb): we must do this because of
 # https://github.com/ansible/ansible/issues/4297
-- name: combine ispartition results
+- name: set_fact combined_activate_osd_disk_results
   set_fact:
     combined_activate_osd_disk_results: "{{ activate_osd_disk if osd_scenario != 'collocated' else activate_osd_disk_dmcrypt }}"
 
index 2906095e3f29c94e35f4b0beb0f9600bd47a5f70..cb93c72bd3824fca5f42fce4e6a6e25dfbf28ce0 100644 (file)
@@ -1,5 +1,6 @@
 ---
-- set_fact:
+- name: set_fact ceph_disk_cli_options '--cluster {{ cluster }} --bluestore'
+  set_fact:
     ceph_disk_cli_options: "--cluster {{ cluster }} --bluestore"
   when:
     - osd_objectstore == 'bluestore'
@@ -7,7 +8,8 @@
     - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
     - not containerized_deployment
 
-- set_fact:
+- name: set_fact ceph_disk_cli_options 'ceph_disk_cli_options'
+  set_fact:
     ceph_disk_cli_options: "--cluster {{ cluster }} --filestore"
   when:
     - osd_objectstore == 'filestore'
@@ -15,7 +17,8 @@
     - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
     - not containerized_deployment
 
-- set_fact:
+- name: set_fact ceph_disk_cli_options '--cluster {{ cluster }}'
+  set_fact:
     ceph_disk_cli_options: "--cluster {{ cluster }}"
   when:
     - osd_objectstore == 'filestore'
@@ -23,7 +26,8 @@
     - ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous
     - not containerized_deployment
 
-- set_fact:
+- name: set_fact ceph_disk_cli_options '--cluster {{ cluster }} --bluestore --dmcrypt'
+  set_fact:
     ceph_disk_cli_options: "--cluster {{ cluster }} --bluestore --dmcrypt"
   when:
     - osd_objectstore == 'bluestore'
@@ -31,7 +35,8 @@
     - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
     - not containerized_deployment
 
-- set_fact:
+- name: set_fact ceph_disk_cli_options '--cluster {{ cluster }} --filestore --dmcrypt'
+  set_fact:
     ceph_disk_cli_options: "--cluster {{ cluster }} --filestore --dmcrypt"
   when:
     - osd_objectstore == 'filestore'
@@ -39,7 +44,8 @@
     - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
     - not containerized_deployment
 
-- set_fact:
+- name: set_fact ceph_disk_cli_options '--cluster {{ cluster }} --dmcrypt'
+  set_fact:
     ceph_disk_cli_options: "--cluster {{ cluster }} --dmcrypt"
   when:
     - osd_objectstore == 'filestore'
     - ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous
     - not containerized_deployment
 
-- set_fact:
+- name: set_fact docker_env_args '-e KV_TYPE={{ kv_type }} -e KV_IP={{ kv_endpoint }} -e KV_PORT={{ kv_port }}'
+  set_fact:
     docker_env_args: -e KV_TYPE={{ kv_type }} -e KV_IP={{ kv_endpoint }} -e KV_PORT={{ kv_port }}
   when:
     - containerized_deployment_with_kv
 
-- set_fact:
+- name: set_fact docker_env_args '-e OSD_BLUESTORE=0 -e OSD_FILESTORE=1 -e OSD_DMCRYPT=0'
+  set_fact:
     docker_env_args: -e OSD_BLUESTORE=0 -e OSD_FILESTORE=1 -e OSD_DMCRYPT=0
   when:
     - containerized_deployment
     - osd_objectstore == 'filestore'
     - not dmcrypt
 
-- set_fact:
+- name: set_fact docker_env_args '-e OSD_BLUESTORE=0 -e OSD_FILESTORE=1 -e OSD_DMCRYPT=1'
+  set_fact:
     docker_env_args: -e OSD_BLUESTORE=0 -e OSD_FILESTORE=1 -e OSD_DMCRYPT=1
   when:
     - containerized_deployment
     - osd_objectstore == 'filestore'
     - dmcrypt
 
-- set_fact:
+- name: set_fact docker_env_args '-e OSD_BLUESTORE=1 -e OSD_FILESTORE=0 -e OSD_DMCRYPT=0'
+  set_fact:
     docker_env_args: -e OSD_BLUESTORE=1 -e OSD_FILESTORE=0 -e OSD_DMCRYPT=0
   when:
     - containerized_deployment
     - osd_objectstore == 'bluestore'
     - not dmcrypt
 
-- set_fact:
+- name: set_fact docker_env_args '-e OSD_BLUESTORE=1 -e OSD_FILESTORE=0 -e OSD_DMCRYPT=1'
+  set_fact:
     docker_env_args: -e OSD_BLUESTORE=1 -e OSD_FILESTORE=0 -e OSD_DMCRYPT=1
   when:
     - containerized_deployment
index ea2455fce238226744459c5f8ca9899206fbf0c3..c03222fa440fdbb66dc44eda719029d099e040e0 100644 (file)
@@ -10,7 +10,8 @@
 # allow 2-digit partition numbers so fast SSDs can be shared by > 9 disks
 # for SSD journals.
 
-- include: ./check_devices_static.yml
+- name: include check_devices_static.yml
+  include: check_devices_static.yml
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
index 800a9fca278e153e31922b7e6ec99d31e2999571..5b0c0de63eece215433135d3da9d0c4a5ada484a 100644 (file)
@@ -2,7 +2,8 @@
 - name: make sure public_network configured
   fail:
     msg: "public_network must be configured. Ceph public network"
-  when: public_network == '0.0.0.0/0'
+  when:
+    - public_network == '0.0.0.0/0'
 
 - name: make sure cluster_network configured
   fail:
index 29d365b8af278b10e0a6525af7e3c0fc6d0aaa4e..2501f5bbf232e0b18a0f37394485c666bf5b4ae7 100644 (file)
@@ -36,4 +36,5 @@
     - "{{ ceph_conf_key_directory }}"
     - /var/lib/ceph
   changed_when: false
-  when: sestatus.stdout != 'Disabled'
+  when:
+    - sestatus.stdout != 'Disabled'
index db0fad568efdb9c71f43fd7c1fa82dc96f4977e3..e86b36a18da1ba011bdce13bff04eb86ec58b419 100644 (file)
@@ -1,2 +1,8 @@
 ---
-- include: start_docker_osd.yml
+- name: include osd_fragment.yml
+  include: osd_fragment.yml
+  when:
+    - crush_location
+
+- name: include start_docker_osd.yml
+  include: start_docker_osd.yml
index 27039092c2f8ff0d3f72bf26fa3343fff4bed617..bab4e7ce9bf4edd04455d1b64108344a3fc2b822 100644 (file)
@@ -7,7 +7,8 @@
     src: /dev/vdb
     fstype: ext3
     state: unmounted
-  when: ceph_docker_on_openstack
+  when:
+    - ceph_docker_on_openstack
 
 - name: generate ceph osd docker run script
   become: true
index 3c275e435b5b31894b693ee0e1e010a8de005f56..3a9e807fe97290767b0d6a8fb14fad6a0d89cf0a 100644 (file)
@@ -1,14 +1,18 @@
 ---
-- include: check_mandatory_vars.yml
+- name: include check_mandatory_vars.yml
+  include: check_mandatory_vars.yml
 
-- include: pre_requisite.yml
-  when: not containerized_deployment
+- name: include pre_requisite.yml
+  include: pre_requisite.yml
+  when:
+    - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- include: ceph_disk_cli_options_facts.yml
+- name: include ceph_disk_cli_options_facts.yml
+  include: ceph_disk_cli_options_facts.yml
 
-- name: generate device list when osd_auto_discovery
+- name: set_fact devices generate device list when osd_auto_discovery
   set_fact:
     devices: "{{ devices | default([]) + [ item.key | regex_replace('^', '/dev/') ] }}"
   with_dict: "{{ ansible_devices }}"
     - item.value.holders|count == 0
     - osd_auto_discovery
 
-- include: check_devices.yml
+- name: include check_devices.yml
+  include: check_devices.yml
 
-- include: copy_configs.yml
+- name: include copy_configs.yml
+  include: copy_configs.yml
   when:
     - containerized_deployment
     - not containerized_deployment_with_kv
 
-- include: ./scenarios/collocated.yml
+- name: include scenarios/collocated.yml
+  include: scenarios/collocated.yml
   when:
     - osd_scenario == 'collocated'
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- include: ./scenarios/non-collocated.yml
+- name: include scenarios/non-collocated.yml
+  include: scenarios/non-collocated.yml
   when:
     - osd_scenario == 'non-collocated'
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- name: create lvm osds with ceph-volume
-  include: ./scenarios/lvm.yml
+- name: include scenarios/lvm.yml
+  include: scenarios/lvm.yml
   when:
     - osd_scenario == 'lvm'
     - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- include: ./activate_osds.yml
+- name: include activate_osds.yml
+  include: activate_osds.yml
   when:
     - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- name: ensure osd daemons are started
+- name: include start_osds.yml
   include: start_osds.yml
   when:
     - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- include: ./docker/main.yml
-  when: containerized_deployment
+- name: include docker/main.yml
+  include: docker/main.yml
+  when:
+    - containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
index 324ad1b4e34ac4befea0980e6d9d324734dfb879..f7e71d6cc6770b86ff25e490e0fe7956c12ddf58 100644 (file)
@@ -17,7 +17,7 @@
 
 # NOTE (leseb): we must do this because of
 # https://github.com/ansible/ansible/issues/4297
-- name: combine osd_path results
+- name: set_fact combined_osd_id
   set_fact:
     combined_osd_id: "{{ osd_id_non_dir_scenario }}"
 
index 59b419243ff3347321e05fb612413f39ac02d1e4..39afc7911fb3498c33a3dca60073539ed4b4612e 100644 (file)
@@ -5,13 +5,15 @@
     section: extras
     option: enabled
     value: 1
-  when: ansible_distribution == 'CentOS'
+  when:
+    - ansible_distribution == 'CentOS'
 
 - name: install rependencies
   package:
     name: parted
     state: present
-  when: ansible_os_family != 'ClearLinux'
+  when:
+    - ansible_os_family != 'ClearLinux'
 
 - name: create bootstrap-osd and osd directories
   file:
@@ -26,7 +28,7 @@
     - /var/lib/ceph/bootstrap-osd/
     - /var/lib/ceph/osd/
 
-- name: copy ceph admin key when using dmcrypt
+- name: set_fact copy_admin_key
   set_fact:
     copy_admin_key: true
   when:
index f2b78a2b61b6f2f4a684b34d48588a621d362218..da140bd07f4ec1ee2ff6ea0524702486d1ce7098 100644 (file)
@@ -1,7 +1,4 @@
 ---
-- include: osd_fragment.yml
-  when: crush_location
-
 - name: get osd id
   shell: |
     ls /var/lib/ceph/osd/ | sed 's/.*-//'
index 2d81ce195df94c39a31ff76f3a06ff3b9cda960e..3f50d879e98ab639bd60e59c96257d71fb279a6c 100644 (file)
@@ -1,10 +1,11 @@
 ---
-- name: register rbd bootstrap key
+- name: set_fact bootstrap_rbd_keyring
   set_fact:
     bootstrap_rbd_keyring: "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
-  when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
+  when:
+    - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
 
-- name: set config and keys paths
+- name: set_fact ceph_config_keys
   set_fact:
     ceph_config_keys:
       - /etc/ceph/{{ cluster }}.conf
@@ -31,7 +32,8 @@
   with_together:
     - "{{ ceph_config_keys }}"
     - "{{ statconfig.results }}"
-  when: item.1.stat.exists == true
+  when:
+    - item.1.stat.exists == true
 
 - name: set selinux permissions
   shell: |
@@ -40,4 +42,5 @@
     - "{{ ceph_conf_key_directory }}"
     - /var/lib/ceph
   changed_when: false
-  when: sestatus.stdout != 'Disabled'
+  when:
+    - sestatus.stdout != 'Disabled'
index fa221177e9f1d31002343346aa4f9ebd43bddaa3..65ff3208089890ad0493017f3a518d507d3dfb36 100644 (file)
@@ -1,3 +1,6 @@
 ---
-- include: copy_configs.yml
-- include: start_docker_rbd_mirror.yml
+- name: include copy_configs.yml
+  include: copy_configs.yml
+
+- name: include start_docker_rbd_mirror.yml
+  include: start_docker_rbd_mirror.yml
index cdad90bfb9c7a5e05178ad637f58751f11678ba9..c2e753f751dc4f35600b9c317eaa9dac44f96aaa 100644 (file)
@@ -1,14 +1,21 @@
 ---
-- include: pre_requisite.yml
-  when: not containerized_deployment
+- name: include pre_requisite.yml
+  include: pre_requisite.yml
+  when:
+    - not containerized_deployment
 
-- include: start_rbd_mirror.yml
-  when: not containerized_deployment
+- name: include start_rbd_mirror.yml
+  include: start_rbd_mirror.yml
+  when:
+    - not containerized_deployment
 
-- include: configure_mirroring.yml
+- name: include configure_mirroring.yml
+  include: configure_mirroring.yml
   when:
     - ceph_rbd_mirror_configure
     - not containerized_deployment
 
-- include: ./docker/main.yml
-  when: containerized_deployment
+- name: include docker/main.yml
+  include: docker/main.yml
+  when:
+    - containerized_deployment
index a6fdbdb9dfe7a0152249f5f89c6322257b7c0d2c..62a80437264ab797e6a9073a8a6e1cc6056d0be9 100644 (file)
@@ -23,7 +23,8 @@
     state: started
     enabled: yes
   changed_when: false
-  when: ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous
+  when:
+    - ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous
 
 - name: stop and remove the generic rbd-mirror service instance
   service:
@@ -31,7 +32,8 @@
     state: stopped
     enabled: no
   changed_when: false
-  when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
+  when:
+    - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
 
 - name: start and add the rbd-mirror service instance
   service:
@@ -39,4 +41,5 @@
     state: started
     enabled: yes
   changed_when: false
-  when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
+  when:
+    - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
index 8af83002cf36014024879c3ad76dd11388455792..2ecb548bba7afc19eae0f0e6a30643d051abdb71 100644 (file)
@@ -1,5 +1,5 @@
 ---
-- name: set config and keys paths
+- name: set_fact ceph_config_keys
   set_fact:
     ceph_config_keys:
       - /etc/ceph/{{ cluster }}.conf
@@ -25,7 +25,8 @@
   with_together:
     - "{{ ceph_config_keys }}"
     - "{{ statconfig.results }}"
-  when: item.1.stat.exists == true
+  when:
+    - item.1.stat.exists == true
 
 - name: set selinux permissions
   shell: |
@@ -34,4 +35,5 @@
     - "{{ ceph_conf_key_directory }}"
     - /var/lib/ceph
   changed_when: false
-  when: sestatus.stdout != 'Disabled'
+  when:
+    - sestatus.stdout != 'Disabled'
index a571bbcc680dee04d87fb80c93d85d50da23dfc7..0e992d15db0eec750bda067e767be737d157920c 100644 (file)
@@ -1,3 +1,6 @@
 ---
-- include: copy_configs.yml
-- include: start_docker_restapi.yml
+- name: include copy_configs.yml
+  include: copy_configs.yml
+
+- name: include start_docker_restapi.yml
+  include: start_docker_restapi.yml
index e62323e7bef751087a27268fdba9e2cb7dfb81ca..1507a193eb9b6a5ea7d8bb7eba62ce5be573efd2 100644 (file)
@@ -1,9 +1,15 @@
 ---
-- include: pre_requisite.yml
-  when: not containerized_deployment
+- name: include pre_requisite.yml
+  include: pre_requisite.yml
+  when:
+    - not containerized_deployment
 
-- include: start_restapi.yml
-  when: not containerized_deployment
+- name: include start_restapi.yml
+  include: start_restapi.yml
+  when:
+    - not containerized_deployment
 
-- include: ./docker/main.yml
-  when: containerized_deployment
+- name: include docker/main.yml
+  include: docker/main.yml
+  when:
+    - containerized_deployment
index efdcb3cb89305b895e954928f57c531e60089b96..18e9fc78c080751bc8ea313833e1fde196abe4b1 100644 (file)
@@ -14,7 +14,8 @@
     owner: "ceph"
     group: "ceph"
     mode: "0600"
-  when: cephx
+  when:
+    - cephx
 
 - name: activate ceph rest api with upstart
   file:
@@ -27,7 +28,8 @@
     - done
     - upstart
   changed_when: false
-  when: ansible_distribution == "Ubuntu"
+  when:
+    - ansible_distribution == 'Ubuntu'
 
 - name: activate ceph rest api with sysvinit
   file:
@@ -39,7 +41,8 @@
   with_items:
     - done
     - sysvinit
-  when: ansible_distribution != "Ubuntu"
+  when:
+    - ansible_distribution != 'Ubuntu'
 
 # NOTE (leseb): will uncomment this when this https://github.com/ceph/ceph/pull/4144 lands
 #- name: start and add that the Ceph REST API service to the init sequence (Ubuntu)
index 68fd25bd84dcfd8b4d9c7134d69a592091166e84..1c4f23665b3a119196a9a2908dad1d5102ea9f8d 100644 (file)
@@ -9,4 +9,5 @@
 - name: start ceph rest api
   shell: "nohup ceph-rest-api --conf /etc/ceph/{{ cluster }}.conf &"
   changed_when: false
-  when: restapi_status.rc != 0
+  when:
+    - restapi_status.rc != 0
index ef01f913d4bb237cec37b9e2947179dd9729a670..312cadfdbd163dfcbb8e10ba275c57b16deb2209 100644 (file)
@@ -25,7 +25,8 @@
   with_together:
     - "{{ ceph_config_keys }}"
     - "{{ statconfig.results }}"
-  when: item.1.stat.exists == true
+  when:
+    - item.1.stat.exists == true
 
 - name: set selinux permissions
   shell: |
@@ -34,4 +35,5 @@
     - "{{ ceph_conf_key_directory }}"
     - /var/lib/ceph
   changed_when: false
-  when: sestatus.stdout != 'Disabled'
+  when:
+    - sestatus.stdout != 'Disabled'
index f2124a1e040a54e961cef9a17aa4abf43709980b..cda9f789cfd22148b5afd9cfe149b802d8a9c019 100644 (file)
@@ -1,9 +1,10 @@
 ---
-- name: set config and keys paths
+- name: set_fact rgw_config_keys
   set_fact:
     rgw_config_keys:
       - "/var/lib/ceph/radosgw/{{ ansible_hostname }}/keyring"
-  when: nfs_obj_gw
+  when:
+    - nfs_obj_gw
 
 - name: wait for rgw keyring
   wait_for:
index 7012c42a88f8e41874b4406a0ac76e14a47c0618..80bcb01096ee6f472741b8398d0384781cf942c7 100644 (file)
@@ -1,5 +1,9 @@
 ---
-- include: copy_configs.yml
-- include: start_docker_rgw.yml
+- name: include copy_configs.yml
+  include: copy_configs.yml
 
-- include: copy_rgw_configs.yml
+- name: include start_docker_rgw.yml
+  include: start_docker_rgw.yml
+
+- name: include copy_rgw_configs.yml
+  include: copy_rgw_configs.yml
index 52fb1dd3cdec2576edbf46118510bc36a0572bf2..549fcc1c68b9a6f7292f55230f201eeeb3372cdc 100644 (file)
@@ -1,35 +1,44 @@
 ---
-- include: pre_requisite.yml
-  when: not containerized_deployment
+- name: include pre_requisite.yml
+  include: pre_requisite.yml
+  when:
+    - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- include: openstack-keystone.yml
+- name: include openstack-keystone.yml
+  include: openstack-keystone.yml
   when:
     - radosgw_keystone|bool
     - radosgw_keystone_ssl|bool
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- include: start_radosgw.yml
-  when: not containerized_deployment
+- name: include start_radosgw.yml
+  include: start_radosgw.yml
+  when:
+    - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- include: rgw_pool_pgs.yml
-  when: create_pools is defined
+- name: include rgw_pool_pgs.yml
+  include: rgw_pool_pgs.yml
+  when:
+    - create_pools is defined
   static: False
 
-- name: include rgw multisite playbooks
+- name: include multisite/main.yml
   include: multisite/main.yml
   when:
     - rgw_zone is defined
     - rgw_multisite
-    - ( ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel )
+    - 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
 
-- include: ./docker/main.yml
-  when: containerized_deployment
+- name: include docker/main.yml
+  include: docker/main.yml
+  when:
+    - containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
index de3c63715816e1d5c47cebafdac74a2839432f66..acef129c6598504eaf619bac97ccf0abbacaa3c9 100644 (file)
@@ -24,6 +24,8 @@
     dest: "/etc/ceph/{{ cluster }}.conf"
     regexp: "rgw_zone = {{ rgw_zonegroup }}-{{ rgw_zone }}"
     state: absent
-  when: "rgw_zone is defined and rgw_zonegroup is defined"
+  when:
+    - rgw_zone is defined
+    - rgw_zonegroup is defined
   notify:
     - restart rgw
index 2f7114a3dacd2a4cadb4db78d89fdabc115fbc9d..6485e7338365d5d7774bf0583e2d00ebb8c0deb7 100644 (file)
@@ -5,13 +5,17 @@
 # Include the tasks depending on the zone type
 - name: include master multisite tasks
   include: master.yml
-  when: "rgw_zonemaster is defined and rgw_zonemaster"
+  when:
+    - rgw_zonemaster is defined
+    - rgw_zonemaster
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
 - name: include secondary multisite tasks
   include: secondary.yml
-  when: "rgw_zonesecondary is defined and rgw_zonesecondary"
+  when:
+    - rgw_zonesecondary is defined
+    - rgw_zonesecondary
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
index ff818465b7cbe67e90a26867ea4d1a83c19d82b8..5b5c78e6779b9bd8ae66ee331b777db1ba39c439 100644 (file)
@@ -2,27 +2,34 @@
 - name: create the realm
   command: radosgw-admin realm create --rgw-realm={{ rgw_realm }} --default
   run_once: true
-  when: ("No such file or directory" in realmcheck.stderr) and rgw_zonemaster
+  when:
+    - 'No such file or directory' in realmcheck.stderr
+    - rgw_zonemaster
   notify:
     - update period
 
-- name: create the zonegroup 
+- name: create the zonegroup
   command: radosgw-admin zonegroup create --rgw-zonegroup={{ rgw_zonegroup }} --endpoints=http://{{ ansible_fqdn }}:{{ radosgw_civetweb_port }} --master --default
   run_once: true
-  when: ("No such file or directory" in zonegroupcheck.stderr) and rgw_zonemaster
+  when:
+    - 'No such file or directory' in zonegroupcheck.stderr
+    - rgw_zonemaster
   notify:
     - update period
 
 - name: create the zone
   command: radosgw-admin zone create --rgw-zonegroup={{ rgw_zonegroup }} --rgw-zone={{ rgw_zone }} --endpoints=http://{{ ansible_fqdn }}:{{ radosgw_civetweb_port }} --access-key={{ system_access_key }} --secret={{ system_secret_key }} --default --master
   run_once: true
-  when: ("No such file or directory" in zonecheck.stderr) and rgw_zonemaster
+  when:
+    - 'No such file or directory' in zonecheck.stderr
+    - rgw_zonemaster
   notify:
     - update period
 
 - name: create the zone user
   command: radosgw-admin user create --uid=zone.user --display-name="Zone User" --access-key={{ system_access_key }} --secret={{ system_secret_key }} --system
   run_once: true
-  when: "'could not fetch user info: no user info saved' in usercheck.stderr"
+  when:
+    - 'could not fetch user info: no user info saved' in usercheck.stderr
   notify:
     - update period
index 7623e832c3f9ec0a5fbafbb396e348555b8d00a5..d844e143e9023cd12e3c72d71eadaa7ba221272e 100644 (file)
@@ -2,14 +2,16 @@
 - name: fetch the realm
   command: radosgw-admin realm pull --url={{ rgw_pull_proto }}://{{ rgw_pullhost }}:{{ rgw_pull_port }} --access-key={{ system_access_key }} --secret={{ system_secret_key }}
   run_once: true
-  when: ("No such file or directory" in realmcheck.stderr)
+  when:
+    - 'No such file or directory' in realmcheck.stderr
   notify:
     - update period
 
 - name: fetch the period
   command: radosgw-admin period pull --url={{ rgw_pull_proto }}://{{ rgw_pullhost }}:{{ rgw_pull_port }} --access-key={{ system_access_key }} --secret={{ system_secret_key }}
   run_once: true
-  when: ("No such file or directory" in realmcheck.stderr)
+  when:
+    - 'No such file or directory' in realmcheck.stderr
   notify:
     - update period
 
@@ -28,6 +30,7 @@
 - name: create the zone
   command: radosgw-admin zone create --rgw-zonegroup={{ rgw_zonegroup }} --rgw-zone={{ rgw_zone }} --endpoints=http://{{ ansible_hostname }}:{{ radosgw_civetweb_port }} --access-key={{ system_access_key }} --secret={{ system_secret_key }} --default
   run_once: true
-  when: ("No such file or directory" in zonecheck.stderr)
+  when:
+    - 'No such file or directory' in zonecheck.stderr
   notify:
     - update period
index ece05e84242fbc4877247054ff2fe5616cf89a20..ab0653ec309439e2f055454c3fc9d91597b654a1 100644 (file)
@@ -3,13 +3,15 @@
   package:
     name: nss-tools
     state: present
-  when: ansible_pkg_mgr == "yum" or ansible_pkg_mgr == "dnf"
+  when:
+    - ansible_pkg_mgr == 'yum' or ansible_pkg_mgr == 'dnf'
 
 - name: install libnss3-tools on debian
   package:
     name: libnss3-tools
     state: present
-  when: ansible_pkg_mgr == 'apt'
+  when:
+    - ansible_pkg_mgr == 'apt'
 
 - name: create nss directory for keystone certificates
   file:
index 1e848b5c0f14c25bc4df609fe05ab564f86197bc..4e6d38817367df06af03d6b33be2a42043c01a76 100644 (file)
@@ -3,5 +3,6 @@
   command: ceph --connect-timeout 5 --cluster {{ cluster }} osd pool create {{ item.key }} {{ item.value.pg_num }}
   changed_when: false
   failed_when: false
-  when: create_pools is defined
   with_dict: "{{ create_pools }}"
+  when:
+    - create_pools is defined