]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
don't use private option for import_role
authorRishabh Dave <ridave@redhat.com>
Mon, 12 Nov 2018 11:10:40 +0000 (16:40 +0530)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Tue, 4 Dec 2018 23:45:59 +0000 (23:45 +0000)
Since sharing variables amongst roles has been made default since
Ansible 2.6, private option has been deprecated; so stop using it.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
12 files changed:
infrastructure-playbooks/add-osd.yml
infrastructure-playbooks/rgw-standalone.yml
infrastructure-playbooks/rolling_update.yml
infrastructure-playbooks/shrink-mon.yml
infrastructure-playbooks/shrink-osd-ceph-disk.yml
infrastructure-playbooks/shrink-osd.yml
infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
infrastructure-playbooks/take-over-existing-cluster.yml
infrastructure-playbooks/untested-by-ci/replace-osd.yml
site-container.yml.sample
site.yml.sample
test.yml

index 332bbe829cd0ed6d7b532d6e24fbf8e3fae18c3c..9acf83e8f7b05509a5d6bae1bfa2bca6070e2936 100644 (file)
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     - import_role:
         name: ceph-validate
-        private: false
 
 - hosts: osds
   gather_facts: False
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     - import_role:
         name: ceph-handler
-        private: false
 
     - import_role:
         name: ceph-infra
-        private: false
 
     - import_role:
         name: ceph-container-common
-        private: false
       when: containerized_deployment | bool
 
     - import_role:
         name: ceph-common
-        private: false
       when: not containerized_deployment | bool
 
     - import_role:
         name: ceph-config
-        private: false
 
     - import_role:
         name: ceph-osd
-        private: false
 
     # post-tasks for preceding import
     - name: unset noup flag
index bc9868dc7434d0d56cc661582a56a26236247a67..d52d0ae73f90ea78280b7738b143ecf223fecb08 100644 (file)
@@ -8,17 +8,13 @@
   tasks:
   - import_role:
       name: ceph-defaults
-      private: false
   - import_role:
       name: ceph-fetch-keys
-      private: false
 
 - hosts: rgws
   become: True
   tasks:
   - import_role:
       name: ceph-defaults
-      private: false
   - import_role:
       name: ceph-rgw
-      private: false
index 98ad833cb4fa44bb3f814364c2611acd3d6dab37..ffda4d7e9dd3a87e9e9d6bf645e8e2eb5da1355f 100644 (file)
 
     - import_role:
         name: ceph-defaults
-        private: false
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
       when: not containerized_deployment
     - import_role:
         name: ceph-container-common
-        private: false
       when: containerized_deployment
     - import_role:
         name: ceph-config
-        private: false
     - import_role:
         name: ceph-mon
-        private: false
     - import_role:
         name: ceph-mgr
-        private: false
       when: groups.get(mgr_group_name, []) | length == 0
 
     - name: start ceph mon
   tasks:
     - import_role:
         name: ceph-defaults
-        private: false
 
     - name: non container - get current fsid
       command: "ceph --cluster {{ cluster }} fsid"
 
     - import_role:
         name: ceph-defaults
-        private: false
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
       when: not containerized_deployment
     - import_role:
         name: ceph-container-common
-        private: false
       when: containerized_deployment
     - import_role:
         name: ceph-config
-        private: false
     - import_role:
         name: ceph-mgr
-        private: false
 
     - name: start ceph mgr
       systemd:
 
     - import_role:
         name: ceph-defaults
-        private: false
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
       when: not containerized_deployment
     - import_role:
         name: ceph-container-common
-        private: false
       when: containerized_deployment
     - import_role:
         name: ceph-config
-        private: false
     - import_role:
         name: ceph-osd
-        private: false
 
     - name: get osd numbers
       shell: "if [ -d /var/lib/ceph/osd ] ; then ls /var/lib/ceph/osd | sed 's/.*-//' ; fi"
   tasks:
     - import_role:
         name: ceph-defaults
-        private: false
 
     - name: set_fact docker_exec_cmd_osd
       set_fact:
 
     - import_role:
         name: ceph-defaults
-        private: false
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
       when: not containerized_deployment
     - import_role:
         name: ceph-container-common
-        private: false
       when: containerized_deployment
     - import_role:
         name: ceph-config
-        private: false
     - import_role:
         name: ceph-mds
-        private: false
 
     - name: start ceph mds
       systemd:
 
     - import_role:
         name: ceph-defaults
-        private: false
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
       when: not containerized_deployment
     - import_role:
         name: ceph-container-common
-        private: false
       when: containerized_deployment
     - import_role:
         name: ceph-config
-        private: false
     - import_role:
         name: ceph-rgw
-        private: false
 
     - name: start ceph rgw
       systemd:
 
     - import_role:
         name: ceph-defaults
-        private: false
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
       when: not containerized_deployment
     - import_role:
         name: ceph-container-common
-        private: false
       when: containerized_deployment
     - import_role:
         name: ceph-config
-        private: false
     - import_role:
         name: ceph-rbd-mirror
-        private: false
 
     - name: start ceph rbd mirror
       systemd:
 
     - import_role:
         name: ceph-defaults
-        private: false
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
       when: not containerized_deployment
     - import_role:
         name: ceph-container-common
-        private: false
       when: containerized_deployment
     - import_role:
         name: ceph-config
-        private: false
     - import_role:
         name: ceph-nfs
-        private: false
 
     - name: start nfs gateway
       systemd:
 
     - import_role:
         name: ceph-defaults
-        private: false
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
       when: not containerized_deployment
     - import_role:
         name: ceph-container-common
-        private: false
       when: containerized_deployment
     - import_role:
         name: ceph-config
-        private: false
     - import_role:
         name: ceph-iscsi-gw
-        private: false
 
     - name: start rbd-target-gw
       systemd:
   tasks:
     - import_role:
         name: ceph-defaults
-        private: false
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
       when: not containerized_deployment
     - import_role:
         name: ceph-container-common
-        private: false
       when: containerized_deployment
     - import_role:
         name: ceph-config
-        private: false
     - import_role:
         name: ceph-client
-        private: false
 
 
 - name: show ceph status
   tasks:
     - import_role:
         name: ceph-defaults
-        private: false
 
     - name: set_fact docker_exec_cmd_status
       set_fact:
index f0665c75eba6d86156a7a4f1be2bcefa8bf7912e..84d8d2270524b4a2c34c8db13385d1fee9b83e8b 100644 (file)
@@ -69,7 +69,6 @@
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     # post_tasks for preceding import
     - name: pick a monitor different than the one we want to remove
index c9f9327be2b8c213b0c3856e2025f26ef93f2b68..e3985932f4f46f23106597c1be21d70c60d7026e 100644 (file)
@@ -54,7 +54,6 @@
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     # post-task for preceding import
     - name: "set_fact docker_exec_cmd build {{ container_binary }} exec command (containerized)"
index 6bead567e8e397999919be499c9624556cf377b4..59466efbec0d48ddf6fd7eee13ef5cfc8cb53037 100644 (file)
@@ -58,7 +58,6 @@
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     # post-task for preceding import
     - name: set_fact docker_exec_cmd build docker exec command (containerized)
index 80a956b8a89b67056e2324dbbc78ce1f6ab99619..d701dda76691c6c071716b6b125638e8b63621d5 100644 (file)
 
     - import_role:
         name: ceph-defaults
-        private: false
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-container-common
-        private: false
     - import_role:
         name: ceph-mon
-        private: false
 
     # post-tasks for preceding import -
   post_tasks:
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     - import_role:
         name: ceph-handler
-        private: false
 
     - import_role:
         name: ceph-container-common
-        private: false
 
     - import_role:
         name: ceph-mgr
-        private: false
 
 
 - name: switching from non-containerized to containerized ceph osd
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     # pre-tasks for following importing
     - name: collect running osds and ceph-disk unit(s)
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     - import_role:
         name: ceph-handler
-        private: false
 
     - import_role:
         name: ceph-container-common
-        private: false
 
     - import_role:
         name: ceph-osd
-        private: false
 
     # post-task for preceding import -
     - name: get num_pgs
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     - import_role:
         name: ceph-handler
-        private: false
 
     - import_role:
         name: ceph-container-common
-        private: false
 
     - import_role:
          name: ceph-mds
-         private: false
 
 
 - name: switching from non-containerized to containerized ceph rgw
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     - import_role:
         name: ceph-handler
-        private: false
 
     - import_role:
         name: ceph-container-common
-        private: false
 
     - import_role:
         name: ceph-rgw
-        private: false
 
 
 - name: switching from non-containerized to containerized ceph rbd-mirror
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     - import_role:
         name: ceph-handler
-        private: false
 
     - import_role:
         name: ceph-container-common
-        private: false
 
     - import_role:
         name: ceph-rbd-mirror
-        private: false
 
 
 - name: switching from non-containerized to containerized ceph nfs
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     - import_role:
         name: ceph-handler
-        private: false
 
     - import_role:
         name: ceph-container-common
-        private: false
 
     - import_role:
         name: ceph-nfs
-        private: false
index 7a68ee5c3ee32f6ec2c711e27f2b3cd386d5a4c4..7f70112a7d20c487a5768af2d189ca7ee87d1bb8 100644 (file)
   tasks:
     - import_role:
         name: ceph-defaults
-        private: false
     - import_role:
         name: ceph-fetch-keys
-        private: false
 
 - hosts:
   - mons
@@ -36,7 +34,6 @@
   tasks:
     - import_role:
         name: ceph-defaults
-        private: false
 
     # post-tasks for preceding import -
     - name: get the name of the existing ceph cluster
index 5761de83e28f05f064230ea3657222e9b4bbc376..8fce11d70a31aa8a9c51cfff8f7b13a2ec292139 100644 (file)
@@ -57,7 +57,6 @@
 
     - import_role:
         name: ceph-defaults
-        private: false
 
     # post-tasks for preceding import -
     - name: set_fact docker_exec_cmd build docker exec command (containerized)
index ffd5a4c1eea5a1ff5d2faeff1b81e115f5023c92..3c4425ebf3e90a00531d79c014fceebc9cbe4bbe 100644 (file)
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: [with_pkg, fetch_container_image]
     - import_role:
         name: ceph-validate
-        private: false
     - import_role:
         name: ceph-infra
-        private: false
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-container-common
-        private: false
       tags: [with_pkg, fetch_container_image]
       when:
         - not (is_atomic | bool)
   tasks:
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-container-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-mon
-        private: false
     - import_role:
         name: ceph-mgr
-        private: false
 
 - hosts: mons
   tasks:
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-container-common
-        private: false
     - import_role:
         name: ceph-config
         private: fals
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-mgr
-        private: false
 
     # post-tasks for upcoming imports -
     - name: set ceph manager install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-container-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-osd
-        private: false
 
     # post-tasks for preceding imports -
     - name: set ceph osd install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-container-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-mds
-        private: false
 
     # post-tasks for preceding imports -
     - name: set ceph mds install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-container-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-rgw
-        private: false
 
     # post-tasks for preceding imports -
     - name: set ceph rgw install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-container-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-nfs
-        private: false
 
     # post-tasks for following imports -
     - name: set ceph nfs install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-container-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-rbd-mirror
-        private: false
 
     # post-tasks for preceding imports -
     - name: set ceph rbd mirror install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-container-common
-        private: false
       when:
         - inventory_hostname == groups.get('clients', ['']) | first
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-client
-        private: false
 
     # post-tasks for preceding imports -
     - name: set ceph client install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-container-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-iscsi-gw
-        private: false
 
     # post-tasks for preceding imports -
   post_tasks:
index 0ea698ded27731f54c5b6aa69ca9b6e1dce48c27..677e5516020292a401b7a262e60cadd52ef54f48 100644 (file)
 
     - import_role:
         name: ceph-defaults
-        private: false
     - import_role:
         name: ceph-validate
-        private: false
     - import_role:
         name: ceph-infra
-        private: false
 
 - hosts: mons
   gather_facts: false
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-mon
-        private: false
     - import_role:
         name: ceph-mgr
-        private: false
 
     # post-tasks for preceding imports -
     - name: set ceph monitor install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-mgr
-        private: false
 
     # post-tasks for following imports -
     - name: set ceph manager install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-agent
-        private: false
 
     # post-tasks for following imports -
     - name: set ceph agent install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-osd
-        private: false
 
     # post-tasks for following imports -
     - name: set ceph osd install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-mds
-        private: false
 
     # post-tasks for following imports -
     - name: set ceph mds install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-rgw
-        private: false
 
     # post-tasks for following imports -
     - name: set ceph rgw install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-nfs
-        private: false
 
     # post-tasks for following imports -
     - name: set ceph nfs install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-rbd-mirror
-        private: false
 
     # post-tasks for following imports -
     - name: set ceph rbd mirror install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-client
-        private: false
 
     # post-tasks for following imports -
     - name: set ceph client install 'Complete'
 
     - import_role:
         name: ceph-defaults
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-        private: false
     - import_role:
         name: ceph-common
-        private: false
       when:
         - ceph_release_num[ceph_release] >= ceph_release_num.luminous
     - import_role:
         name: ceph-config
-        private: false
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-iscsi-gw
-        private: false
 
     # post-tasks for following imports -
     - name: set ceph iscsi gw install 'Complete'
index 4e2be2776eb718200a8335108c16a61645b7ccd9..f9d8b4892c42f1f4fd5b168514ec22447571b6fd 100644 (file)
--- a/test.yml
+++ b/test.yml
@@ -4,19 +4,13 @@
   tasks:
   - import_role:
       name: ceph.ceph-common
-      private: false
   - import_role:
       name: ceph-mon
-      private: false
   - import_role:
       name: ceph-osd
-      private: false
   - import_role:
       name: ceph-mds
-      private: false
   - import_role:
       name: ceph-rgw
-      private: false
   - import_role:
       name: ceph-fetch-keys
-      private: false