From: Dimitri Savineau <dsavinea@redhat.com>
Date: Thu, 2 May 2019 13:57:19 +0000 (-0400)
Subject: ansible: remove private and static attribute
X-Git-Tag: v4.0.0rc5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=47523273401ec2710639d6051667dcd72f5dd1da;p=ceph-ansible.git

ansible: remove private and static attribute

This will be removed in ansible 2.8 and breaks the playbook execution
with this release.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit ae266c6f2b9eca06dc1083331d49ea68a4b60562)
---

diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index 9ce5b7616..0abbc00de 100644
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -51,16 +51,12 @@
   when:
     - lvm_volumes|length > 0
     - not rolling_update|default(False)
-  # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
-  static: False
 
 - name: include_tasks scenarios/lvm-batch.yml
   include_tasks: scenarios/lvm-batch.yml
   when:
     - devices|length > 0
     - not rolling_update|default(False)
-  # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
-  static: False
 
 - name: include_tasks start_osds.yml
   include_tasks: start_osds.yml
diff --git a/site-container.yml.sample b/site-container.yml.sample
index 3e9bab72f..d10a66a05 100644
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -165,7 +165,6 @@
         name: ceph-container-common
     - import_role:
         name: ceph-config
-        private: fals
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-mgr