Fix versions, READMEs

Author: mnasiadka

plugins/modules/cephadm_crush_rule.py

@@ -31,7 +31,7 @@
 ---
 module: cephadm_crush_rule
 short_description: Manage Ceph Crush Replicated/Erasure Rule
-version_added: "1.6.0"
+version_added: "1.4.0"
 description:
     - Manage Ceph Crush rule(s) creation, deletion and updates.
 options:

plugins/modules/cephadm_ec_profile.py

@@ -33,7 +33,7 @@
 
 short_description: Manage Ceph Erasure Code profile
 
-version_added: "1.6.0"
+version_added: "1.4.0"
 
 description:
     - Manage Ceph Erasure Code profile
@@ -56,12 +56,12 @@
     k:
         description:
             - Number of data-chunks the object will be split in
-        required: true
+        required: false
     m:
         description:
             - Compute coding chunks for each object and store them on different
               OSDs.
-        required: true
+        required: false
     crush_root:
         description:
             - The name of the crush bucket used for the first step of the CRUSH

plugins/modules/cephadm_key.py

@@ -35,7 +35,7 @@
 
 author: Sebastien Han <[email protected]>
         Michal Nasiadka <[email protected]>
-version_added: "1.6.0"
+version_added: "1.4.0"
 short_description: Manage Cephx key(s)
 
 description:
@@ -125,7 +125,7 @@
 
 - name: info cephx key
   ceph_key:
-    name: "my_key""
+    name: "my_key"
     state: info
 
 - name: info cephx admin key (plain)
@@ -221,14 +221,13 @@ def create_key(module, result, name, secret, caps, import_key, dest):  # noqa: E
     if not secret:
         secret = generate_secret()
 
-    args = ['get-or-create', name]
-    args.extend(generate_caps(None, caps))
-    args.extend(['-o', dest])
-
     cmd_list.append(generate_ceph_authtool_cmd(
         name, secret, caps, dest))
 
     if import_key:
+        args = ['get-or-create', name]
+        args.extend(generate_caps(None, caps))
+        args.extend(['-o', dest])
         cmd_list.append(generate_ceph_cmd(sub_cmd=['auth'],
                                           args=args))
 

plugins/modules/cephadm_pool.py

@@ -31,7 +31,7 @@
 author: Guillaume Abrioux <[email protected]>
         Michal Nasiadka <[email protected]>
 short_description: Manage Ceph Pools
-version_added: "1.6.0"
+version_added: "1.4.0"
 description:
     - Manage Ceph pool(s) creation, deletion and updates.
 options:

roles/ec_profiles/README.md

@@ -1,6 +1,6 @@
-# keys
+# ec_profiles
 
-This role creates/deletes Ceph keys (cephx).
+This role creates/deletes Ceph EC profiles.
 
 ## Prerequisites
 
@@ -13,27 +13,15 @@ This role creates/deletes Ceph keys (cephx).
 
 This role assumes the existence of the following groups:
 
-* `ceph`
 * `mons`
-* `mgrs`
-* `osds`
-
-Optional groups (those services will be deployed when group exists)::
-
-* `rgws`
-
-All Ceph hosts must be in the `ceph` group.
 
 ## Role variables
 
-* `cephadm_keys`: A list of pools to define
+* `cephadm_ec_profiles`: A list of pools to define
    Example:
    ```
-          cephadm_keys:
-            - name: client.user1
-            - name: client.user2
-              state: absent 
+          cephadm_ec_profiles:
    ```
 
-Check the `cephadm_key` module docs for supported key options.
+Check the `cephadm_ec_profile` module docs for supported key options.
 

roles/ec_profiles/defaults/main.yml

@@ -1 +1 @@
-cephadm_crush_rules: []
+cephadm_ec_profiles: []

roles/keys/README.md

@@ -15,8 +15,6 @@ This role assumes the existence of the following groups:
 
 * `mons`
 
-All Ceph hosts must be in the `ceph` group.
-
 ## Role variables
 
 * `cephadm_keys`: A list of keys to define

roles/pools/README.md

@@ -13,14 +13,7 @@ This role creates/deletes Ceph pools.
 
 This role assumes the existence of the following groups:
 
-* `ceph`
 * `mons`
-* `mgrs`
-* `osds`
-
-Optional groups (those services will be deployed when group exists)::
-
-* `rgws`
 
 All Ceph hosts must be in the `ceph` group.
 
@@ -31,7 +24,11 @@ All Ceph hosts must be in the `ceph` group.
    ```
           cephadm_pools:
             - name: pool1
+              size: 3
+              application: rbd
             - name: pool2
+              size: 2
+              application: rbd
               state: absent 
    ```