diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-19 14:02:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-19 14:02:38 -0400 |
| commit | e432f8a35323e8603f0f58b70d996f7487703ec1 (patch) | |
| tree | 8491b45ee38b860f2b13bd760b7a202e53dd6660 /roles | |
| parent | 882241d56dcfc2654f49ea3296ccb8e3b118f8b8 (diff) | |
| parent | 7b5498d71b615e72b921e38ee72e9faad224400f (diff) | |
| download | openshift-e432f8a35323e8603f0f58b70d996f7487703ec1.tar.gz openshift-e432f8a35323e8603f0f58b70d996f7487703ec1.tar.bz2 openshift-e432f8a35323e8603f0f58b70d996f7487703ec1.tar.xz openshift-e432f8a35323e8603f0f58b70d996f7487703ec1.zip | |
Merge pull request #4787 from kwoodson/storageclass_fix
Fixing invalid param to storageclass. Allowing variable to be passed for default.
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 }}" |