From f917bb015c37d1c171d80ad548fd7a2749abbb66 Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dsavinea@redhat.com>
Date: Fri, 11 Sep 2020 09:34:05 -0400
Subject: [PATCH] ceph_key: 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 abb4023d762305c368facd3fab5a5b7e3a839d66)
---
 infrastructure-playbooks/ceph-keys.yml      | 1 -
 infrastructure-playbooks/rolling_update.yml | 1 -
 library/ceph_key.py                         | 8 ++++----
 roles/ceph-crash/tasks/main.yml             | 1 -
 roles/ceph-mgr/tasks/common.yml             | 2 --
 roles/ceph-mon/tasks/deploy_monitors.yml    | 2 --
 roles/ceph-osd/tasks/openstack_config.yml   | 1 -
 7 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/infrastructure-playbooks/ceph-keys.yml b/infrastructure-playbooks/ceph-keys.yml
index f08076b48..24235e49c 100644
--- a/infrastructure-playbooks/ceph-keys.yml
+++ b/infrastructure-playbooks/ceph-keys.yml
@@ -25,7 +25,6 @@
     - name: create ceph key(s) module
       ceph_key:
         name: "{{ item.name }}"
-        state: present
         caps: "{{ item.caps }}"
         cluster: "{{ cluster }}"
         secret: "{{ item.key | default('') }}"
diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 4dfc798d0..ae5ece121 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -167,7 +167,6 @@
     - name: create potentially missing keys (rbd and rbd-mirror)
       ceph_key:
         name: "client.{{ item.0 }}"
-        state: present
         dest: "/var/lib/ceph/{{ item.0 }}/"
         caps:
           mon: "allow profile {{ item.0 }}"
diff --git a/library/ceph_key.py b/library/ceph_key.py
index 73bbf5598..989e0eb99 100644
--- a/library/ceph_key.py
+++ b/library/ceph_key.py
@@ -70,9 +70,9 @@ options:
             return a json output.
             If 'info' is used, the module will return in a json format the
             description of a given keyring.
-        required: true
-        choices: ['present', 'absent', 'list', 'info']
-        default: list
+        required: false
+        choices: ['present', 'update', 'absent', 'list', 'info', 'fetch_initial_keys']
+        default: present
     caps:
         description:
             - CephX key capabilities
@@ -506,7 +506,7 @@ def run_module():
     module_args = dict(
         cluster=dict(type='str', required=False, default='ceph'),
         name=dict(type='str', required=False),
-        state=dict(type='str', required=True),
+        state=dict(type='str', required=False, default='present', choices=['present', 'update', 'absent', 'list', 'info', 'fetch_initial_keys']),
         caps=dict(type='dict', required=False, default=None),
         secret=dict(type='str', required=False, default=None, no_log=True),
         import_key=dict(type='bool', required=False, default=True),
diff --git a/roles/ceph-crash/tasks/main.yml b/roles/ceph-crash/tasks/main.yml
index c4d9eb51e..4bcb62274 100644
--- a/roles/ceph-crash/tasks/main.yml
+++ b/roles/ceph-crash/tasks/main.yml
@@ -4,7 +4,6 @@
   block:
     - name: create client.crash keyring
       ceph_key:
-        state: present
         name: "client.crash"
         caps:
           mon: 'allow profile crash'
diff --git a/roles/ceph-mgr/tasks/common.yml b/roles/ceph-mgr/tasks/common.yml
index ae4744034..e924dcac2 100644
--- a/roles/ceph-mgr/tasks/common.yml
+++ b/roles/ceph-mgr/tasks/common.yml
@@ -10,7 +10,6 @@
 - name: fetch ceph mgr keyring
   ceph_key:
     name: "mgr.{{ ansible_hostname }}"
-    state: present
     caps:
       mon: allow profile mgr
       osd: allow *
@@ -32,7 +31,6 @@
     - name: create ceph mgr keyring(s) on a mon node
       ceph_key:
         name: "mgr.{{ hostvars[item]['ansible_hostname'] }}"
-        state: present
         caps:
           mon: allow profile mgr
           osd: allow *
diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml
index 5ede5f631..3c3e28b13 100644
--- a/roles/ceph-mon/tasks/deploy_monitors.yml
+++ b/roles/ceph-mon/tasks/deploy_monitors.yml
@@ -30,7 +30,6 @@
 - name: create monitor initial keyring
   ceph_key:
     name: mon.
-    state: present
     dest: "/var/lib/ceph/tmp/"
     secret: "{{ monitor_keyring }}"
     cluster: "{{ cluster }}"
@@ -75,7 +74,6 @@
 - name: create custom admin keyring
   ceph_key:
     name: client.admin
-    state: present
     secret: "{{ admin_secret }}"
     caps: "{{ client_admin_ceph_authtool_cap }}"
     import_key: False
diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml
index 64ea152a1..43be57b23 100644
--- a/roles/ceph-osd/tasks/openstack_config.yml
+++ b/roles/ceph-osd/tasks/openstack_config.yml
@@ -92,7 +92,6 @@
   block:
     - name: generate keys
       ceph_key:
-        state: present
         name: "{{ item.name }}"
         caps: "{{ item.caps }}"
         secret: "{{ item.key | default('') }}"