diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-07-19 08:58:35 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-07-19 09:35:58 -0400 |
| commit | 7b5498d71b615e72b921e38ee72e9faad224400f (patch) | |
| tree | 92ca878c9fd8802989552905cf7a9c10e2fc1531 /roles | |
| parent | f1711875170934936895fe24ac1f7ab721608c5a (diff) | |
| download | openshift-7b5498d71b615e72b921e38ee72e9faad224400f.tar.gz openshift-7b5498d71b615e72b921e38ee72e9faad224400f.tar.bz2 openshift-7b5498d71b615e72b921e38ee72e9faad224400f.tar.xz openshift-7b5498d71b615e72b921e38ee72e9faad224400f.zip | |
Removing parameter kind and allowing default to be passed.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_default_storage_class/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_default_storage_class/tasks/main.yml | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_default_storage_class/defaults/main.yml b/roles/openshift_default_storage_class/defaults/main.yml index bda83c933..4f371fd89 100644 --- a/roles/openshift_default_storage_class/defaults/main.yml +++ b/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'] }}" diff --git a/roles/openshift_default_storage_class/tasks/main.yml b/roles/openshift_default_storage_class/tasks/main.yml index fd5e4fabe..82cab6746 100644 --- a/roles/openshift_default_storage_class/tasks/main.yml +++ b/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 }}" |