ceph: making rbd / cephs provisioner and nodes optional

Some more optional items in json output. RBD Provisioner, CSI CephFS node and provisioner are now optional and will only be populated if they are available. Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>
leseb · Aug 17, 2020 · a5b4020 · a5b4020
1 parent 940118a
commit a5b4020
Showing 1 changed file with 39 additions and 28 deletions.
diff --git a/cluster/examples/kubernetes/ceph/create-external-cluster-resources.py b/cluster/examples/kubernetes/ceph/create-external-cluster-resources.py
@@ -395,15 +395,19 @@ def _gen_output_map(self):
         self.out_map['ROOK_EXTERNAL_USER_SECRET'] = self.create_checkerKey()
         self.out_map['CSI_RBD_NODE_SECRET_SECRET'] = self.create_cephCSIKeyring_RBDNode()
         self.out_map['CSI_RBD_PROVISIONER_SECRET'] = self.create_cephCSIKeyring_RBDProvisioner()
-        self.out_map['CSI_CEPHFS_NODE_SECRET'] = self.create_cephCSIKeyring_cephFSNode()
-        self.out_map['CSI_CEPHFS_PROVISIONER_SECRET'] = self.create_cephCSIKeyring_cephFSProvisioner()
+        self.out_map['CEPHFS_POOL_NAME'] = self._arg_parser.cephfs_data_pool_name
+        self.out_map['CEPHFS_FS_NAME'] = self._arg_parser.cephfs_filesystem_name
+        self.out_map['CSI_CEPHFS_NODE_SECRET'] = ''
+        self.out_map['CSI_CEPHFS_PROVISIONER_SECRET'] = ''
+        # create CephFS node and provisioner keyring only when MDS exists
+        if self.out_map['CEPHFS_FS_NAME'] and self.out_map['CEPHFS_POOL_NAME']:
+            self.out_map['CSI_CEPHFS_NODE_SECRET'] = self.create_cephCSIKeyring_cephFSNode()
+            self.out_map['CSI_CEPHFS_PROVISIONER_SECRET'] = self.create_cephCSIKeyring_cephFSProvisioner()
         self.out_map['RGW_ENDPOINT'] = self._arg_parser.rgw_endpoint
         self.out_map['MONITORING_ENDPOINT'] = self.get_active_ceph_mgr().split(":")[
             0]
         self.out_map['MONITORING_ENDPOINT_PORT'] = self.get_active_ceph_mgr().split(":")[
             1]
-        self.out_map['CEPHFS_POOL_NAME'] = self._arg_parser.cephfs_data_pool_name
-        self.out_map['CEPHFS_FS_NAME'] = self._arg_parser.cephfs_filesystem_name
         self.out_map['RBD_POOL_NAME'] = self._arg_parser.rbd_data_pool_name
         self.out_map['RGW_POOL_PREFIX'] = self._arg_parser.rgw_pool_prefix
 
@@ -454,30 +458,6 @@ def gen_json_out(self):
                     "userKey": self.out_map['CSI_RBD_NODE_SECRET_SECRET']
                 }
             },
-            {
-                "name": "rook-csi-rbd-provisioner",
-                "kind": "Secret",
-                "data": {
-                    "userID": 'csi-rbd-provisioner',
-                    "userKey": self.out_map['CSI_RBD_PROVISIONER_SECRET']
-                },
-            },
-            {
-                "name": "rook-csi-cephfs-node",
-                "kind": "Secret",
-                "data": {
-                    "adminID": 'csi-cephfs-node',
-                    "adminKey": self.out_map['CSI_CEPHFS_NODE_SECRET']
-                }
-            },
-            {
-                "name": "rook-csi-cephfs-provisioner",
-                "kind": "Secret",
-                "data": {
-                    "adminID": 'csi-cephfs-provisioner',
-                    "adminKey": self.out_map['CSI_CEPHFS_PROVISIONER_SECRET']
-                },
-            },
             {
                 "name": "ceph-rbd",
                 "kind": "StorageClass",
@@ -494,6 +474,37 @@ def gen_json_out(self):
                 }
             }
         ]
+
+        # if 'CSI_RBD_PROVISIONER_SECRET' exists, then only add 'rook-csi-rbd-provisioner' Secret
+        if self.out_map['CSI_RBD_PROVISIONER_SECRET']:
+            json_out.append({
+                "name": "rook-csi-rbd-provisioner",
+                "kind": "Secret",
+                "data": {
+                    "userID": 'csi-rbd-provisioner',
+                    "userKey": self.out_map['CSI_RBD_PROVISIONER_SECRET']
+                },
+            })
+        # if 'CSI_CEPHFS_PROVISIONER_SECRET' exists, then only add 'rook-csi-cephfs-provisioner' Secret
+        if self.out_map['CSI_CEPHFS_PROVISIONER_SECRET']:
+            json_out.append({
+                "name": "rook-csi-cephfs-provisioner",
+                "kind": "Secret",
+                "data": {
+                    "adminID": 'csi-cephfs-provisioner',
+                    "adminKey": self.out_map['CSI_CEPHFS_PROVISIONER_SECRET']
+                },
+            })
+        # if 'CSI_CEPHFS_NODE_SECRET' exists, then only add 'rook-csi-cephfs-node' Secret
+        if self.out_map['CSI_CEPHFS_NODE_SECRET']:
+            json_out.append({
+                "name": "rook-csi-cephfs-node",
+                "kind": "Secret",
+                "data": {
+                    "adminID": 'csi-cephfs-node',
+                    "adminKey": self.out_map['CSI_CEPHFS_NODE_SECRET']
+                }
+            })
         # if 'CEPHFS_FS_NAME' exists, then only add 'cephfs' StorageClass
         if self.out_map['CEPHFS_FS_NAME']:
             json_out.append({