From 0ffbd49ce79f24c984fc319c40e684cb35ad7ef7 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Thu, 20 Jul 2017 10:46:50 -0400 Subject: Added parameters inside of gce defaults. Pass all params to the module. --- roles/openshift_default_storage_class/defaults/main.yml | 3 ++- roles/openshift_default_storage_class/tasks/main.yml | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'roles/openshift_default_storage_class') diff --git a/roles/openshift_default_storage_class/defaults/main.yml b/roles/openshift_default_storage_class/defaults/main.yml index 4f371fd89..8d07dbecc 100644 --- a/roles/openshift_default_storage_class/defaults/main.yml +++ b/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'] }}" diff --git a/roles/openshift_default_storage_class/tasks/main.yml b/roles/openshift_default_storage_class/tasks/main.yml index 82cab6746..8e14e67dc 100644 --- a/roles/openshift_default_storage_class/tasks/main.yml +++ b/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 -- cgit v1.2.1