ceph_pool: set state as optional

Most ansible module using a state parameter default to the present
value (when available) instead of using it as a mandatory option.

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

diff --git a/library/ceph_pool.py b/library/ceph_pool.py
index 46feabda7913a1b7397077b62a7512c7b15a79f7..f61e39fd64831aa04af72e317068025d073f2c7b 100644 (file)
--- a/library/ceph_pool.py
+++ b/library/ceph_pool.py
@@ -457,7 +457,7 @@ def run_module():
     module_args = dict(
         cluster=dict(type='str', required=False, default='ceph'),
         name=dict(type='str', required=True),
-        state=dict(type='str', required=True, choices=['present', 'absent', 'list']),
+        state=dict(type='str', required=False, default='present', choices=['present', 'absent', 'list']),
         details=dict(type='bool', required=False, default=False),
         size=dict(type='str', required=False),
         min_size=dict(type='str', required=False),

diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml
index 6f35763b90cd6d5192026a1e5f6ab5d12f828ee7..bb48000e19b78ff618d68912cf1fde9991ea51fc 100644 (file)
--- a/roles/ceph-client/tasks/create_users_keys.yml
+++ b/roles/ceph-client/tasks/create_users_keys.yml
@@ -32,7 +32,6 @@
 
 - name: create cephx key(s)
   ceph_key:
-    state: present
     name: "{{ item.name }}"
     caps: "{{ item.caps }}"
     secret: "{{ item.key | default('') }}"

diff --git a/roles/ceph-iscsi-gw/tasks/common.yml b/roles/ceph-iscsi-gw/tasks/common.yml
index 678f239c4f2e8fcde73971bfed53de93bfb0dea5..becd37638ca1ef1d26e99fedaa136781020a72de 100644 (file)
--- a/roles/ceph-iscsi-gw/tasks/common.yml
+++ b/roles/ceph-iscsi-gw/tasks/common.yml
@@ -55,7 +55,6 @@
 - name: create iscsi pool
   ceph_pool:
     name: "{{ iscsi_pool_name }}"
-    state: present
     cluster: "{{ cluster }}"
     pg_num: "{{ osd_pool_default_pg_num }}"
     size: "{{ iscsi_pool_size | default(osd_pool_default_size) }}"

diff --git a/roles/ceph-mds/tasks/create_mds_filesystems.yml b/roles/ceph-mds/tasks/create_mds_filesystems.yml
index 7ebb65ac420c76ddf117742dd70f1fc6459431f9..7b87af36ee83ee504a3b263440dd252a7eab0a57 100644 (file)
--- a/roles/ceph-mds/tasks/create_mds_filesystems.yml
+++ b/roles/ceph-mds/tasks/create_mds_filesystems.yml
@@ -12,7 +12,6 @@
         - name: create filesystem pools
           ceph_pool:
             name: "{{ item.name }}"
-            state: present
             cluster: "{{ cluster }}"
             pg_num: "{{ item.pg_num | default(osd_pool_default_pg_num) if not item.0.pg_autoscale_mode | default(False) | bool else 16 }}"
             pgp_num: "{{ item.pgp_num | default(item.pg_num) | default(osd_pool_default_pg_num) if not item.pg_autoscale_mode | default(False) | bool else omit }}"

diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml
index a88ccca2dd67cf5a2f7ee3973f1ca475854804d8..d239e5ea37834580e709c71be724e344ddd553c0 100644 (file)
--- a/roles/ceph-osd/tasks/openstack_config.yml
+++ b/roles/ceph-osd/tasks/openstack_config.yml
@@ -4,7 +4,6 @@
     - name: create openstack pool(s)
       ceph_pool:
         name: "{{ item.name }}"
-        state: present
         cluster: "{{ cluster }}"
         pg_num: "{{ item.pg_num | default(osd_pool_default_pg_num) if not item.0.pg_autoscale_mode | default(False) | bool else 16 }}"
         pgp_num: "{{ item.pgp_num | default(item.pg_num) | default(osd_pool_default_pg_num) if not item.pg_autoscale_mode | default(False) | bool else omit }}"