Removing parameter kind and allowing default to be passed.

playbooks/common/openshift-cluster/openshift_hosted.yml

@@ -26,6 +26,8 @@
       logging_elasticsearch_cluster_size: "{{ openshift_hosted_logging_elasticsearch_cluster_size | default(1) }}"
       logging_elasticsearch_ops_cluster_size: "{{ openshift_hosted_logging_elasticsearch_ops_cluster_size | default(1) }}"
   roles:
+  - role: openshift_default_storage_class
+    when: openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce')
   - role: openshift_hosted
   - role: openshift_metrics
     when: openshift_hosted_metrics_deploy | default(false) | bool
@@ -45,8 +47,6 @@
 
   - role: cockpit-ui
     when: ( openshift.common.version_gte_3_3_or_1_3  | bool ) and ( openshift_hosted_manage_registry | default(true) | bool ) and not (openshift.docker.hosted_registry_insecure | default(false) | bool)
-  - role: openshift_default_storage_class
-    when: openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce')
 
 - name: Update master-config for publicLoggingURL
   hosts: oo_masters_to_config:!oo_first_master

roles/openshift_default_storage_class/defaults/main.yml

@@ -12,6 +12,7 @@ openshift_storageclass_defaults:
     provisioner: kubernetes.io/gce-pd
     type: pd-standard
 
+openshift_storageclass_default: "true"
 openshift_storageclass_name: "{{ openshift_storageclass_defaults[openshift_cloudprovider_kind]['name'] }}"
 openshift_storageclass_provisioner: "{{ openshift_storageclass_defaults[openshift_cloudprovider_kind]['provisioner'] }}"
 openshift_storageclass_parameters: "{{ openshift_storageclass_defaults[openshift_cloudprovider_kind]['parameters'] }}"

roles/openshift_default_storage_class/tasks/main.yml

@@ -2,9 +2,8 @@
 # Install default storage classes in GCE & AWS
 - name: Ensure storageclass object
   oc_storageclass:
-    kind: storageclass
     name: "{{ openshift_storageclass_name }}"
-    default_storage_class: "true"
+    default_storage_class: "{{ openshift_storageclass_default | default('true') | string}}"
     parameters:
       type: "{{ openshift_storageclass_parameters.type | default('gp2') }}"
       encrypted: "{{ openshift_storageclass_parameters.encrypted | default('false') | string }}"