diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-20 20:09:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 20:09:25 -0400 |
| commit | 87689f890bb6d015f6c07e227174dc7c4172766e (patch) | |
| tree | d74d3634d6e144a0b2fe87e319906f853d4a9c46 | |
| parent | 4f5aa38fc9bb2836d9409ad0e6ece87ae9da774a (diff) | |
| parent | 0ffbd49ce79f24c984fc319c40e684cb35ad7ef7 (diff) | |
| download | openshift-87689f890bb6d015f6c07e227174dc7c4172766e.tar.gz openshift-87689f890bb6d015f6c07e227174dc7c4172766e.tar.bz2 openshift-87689f890bb6d015f6c07e227174dc7c4172766e.tar.xz openshift-87689f890bb6d015f6c07e227174dc7c4172766e.zip | |
Merge pull request #4805 from kwoodson/sc_gce_fix
[bz 1473154] Fix gce storageclass provider.
| -rw-r--r-- | roles/openshift_default_storage_class/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_default_storage_class/tasks/main.yml | 5 |
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 |