summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-07-20 10:46:50 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-07-20 10:48:45 -0400
commit0ffbd49ce79f24c984fc319c40e684cb35ad7ef7 (patch)
tree79f60c233b539819369aa9e111f8f074319dda9f
parente29eab4e9813c46f4738a81e8698b001bd5981b9 (diff)
downloadopenshift-0ffbd49ce79f24c984fc319c40e684cb35ad7ef7.tar.gz
openshift-0ffbd49ce79f24c984fc319c40e684cb35ad7ef7.tar.bz2
openshift-0ffbd49ce79f24c984fc319c40e684cb35ad7ef7.tar.xz
openshift-0ffbd49ce79f24c984fc319c40e684cb35ad7ef7.zip
Added parameters inside of gce defaults. Pass all params to the module.
-rw-r--r--roles/openshift_default_storage_class/defaults/main.yml3
-rw-r--r--roles/openshift_default_storage_class/tasks/main.yml5
2 files changed, 3 insertions, 5 deletions
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