Allow fully qualified provisioner names

- Currently if you use a fully qualified name for the
`openshift_storageclass_provisioner` inventory variable such as
`openshift.org/aws-efs`, the `oc_storageclass` task will prepend
`kubernetes.io/` to it and make the provisioner name invalid.
- Some clusters need to use provisioners that are provided by OpenShift
or other providers rather than kubernetes.
- It is also inconsistent because the efs provisioner can be installed
by setting the `openshift_provisioners_efs` inventory variable to True
but the associated storage class cannot be installed without manual
intervention at the moment.
- This change keeps backwards compatibility for the more common non
qualified form but allows a user to specify a fully qualified name if
required.

roles/lib_openshift/library/oc_storageclass.py

@@ -1570,13 +1570,27 @@ class OCStorageClass(OpenShiftCLI):
         return False
 
     @staticmethod
+    def provisionerNameIsFullyQualified(provisionerName):
+        pattern = re.compile('^[a-z0-9A-Z-_.]+\/[a-z0-9A-Z-_.]+$')
+        return pattern.match(provisionerName)
+
+    @staticmethod
     # pylint: disable=too-many-return-statements,too-many-branches
     # TODO: This function should be refactored into its individual parts.
     def run_ansible(params, check_mode):
         '''run the ansible idempotent code'''
 
+        # Make sure that the provisioner is fully qualified before using it
+        # E.g. if 'aws-efs' is provided as a provisioner, convert it to 'kubernetes.io/aws-efs'
+        # but if the name is already qualified  (e.g. 'openshift.org/aws-efs') then leave it be.
+        rawProvisionerName = params['provisioner']
+        if OCStorageClass.provisionerNameIsFullyQualified(rawProvisionerName):
+            qualifiedProvisionerName = rawProvisionerName
+        else:
+            qualifiedProvisionerName = "kubernetes.io/{}".format(params['provisioner'])
+
         rconfig = StorageClassConfig(params['name'],
-                                     provisioner="kubernetes.io/{}".format(params['provisioner']),
+                                     provisioner=qualifiedProvisionerName,
                                      parameters=params['parameters'],
                                      annotations=params['annotations'],
                                      api_version="storage.k8s.io/{}".format(params['api_version']),

roles/lib_openshift/src/class/oc_storageclass.py

@@ -65,13 +65,27 @@ class OCStorageClass(OpenShiftCLI):
         return False
 
     @staticmethod
+    def provisionerNameIsFullyQualified(provisionerName):
+        pattern = re.compile('^[a-z0-9A-Z-_.]+\/[a-z0-9A-Z-_.]+$')
+        return pattern.match(provisionerName)
+
+    @staticmethod
     # pylint: disable=too-many-return-statements,too-many-branches
     # TODO: This function should be refactored into its individual parts.
     def run_ansible(params, check_mode):
         '''run the ansible idempotent code'''
 
+        # Make sure that the provisioner is fully qualified before using it
+        # E.g. if 'aws-efs' is provided as a provisioner, convert it to 'kubernetes.io/aws-efs'
+        # but if the name is already qualified  (e.g. 'openshift.org/aws-efs') then leave it be.
+        rawProvisionerName = params['provisioner']
+        if OCStorageClass.provisionerNameIsFullyQualified(rawProvisionerName):
+            qualifiedProvisionerName = rawProvisionerName
+        else:
+            qualifiedProvisionerName = "kubernetes.io/{}".format(params['provisioner'])
+
         rconfig = StorageClassConfig(params['name'],
-                                     provisioner="kubernetes.io/{}".format(params['provisioner']),
+                                     provisioner=qualifiedProvisionerName,
                                      parameters=params['parameters'],
                                      annotations=params['annotations'],
                                      api_version="storage.k8s.io/{}".format(params['api_version']),