Merge pull request #4805 from kwoodson/sc_gce_fix

[bz 1473154] Fix gce storageclass provider.

roles/openshift_default_storage_class/defaults/main.yml

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

roles/openshift_default_storage_class/tasks/main.yml

@@ -4,8 +4,5 @@
   oc_storageclass:
     name: "{{ openshift_storageclass_name }}"
     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 }}"
-      kmsKeyId: "{{ openshift_storageclass_parameters.kmsKeyId | default('') }}"
+    parameters: "{{ openshift_storageclass_parameters }}"
   run_once: true