diff options
Diffstat (limited to 'roles/openshift_default_storage_class')
| -rw-r--r-- | roles/openshift_default_storage_class/defaults/main.yml | 8 | ||||
| -rw-r--r-- | roles/openshift_default_storage_class/tasks/main.yml | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/roles/openshift_default_storage_class/defaults/main.yml b/roles/openshift_default_storage_class/defaults/main.yml index bda83c933..bdece7640 100644 --- a/roles/openshift_default_storage_class/defaults/main.yml +++ b/roles/openshift_default_storage_class/defaults/main.yml @@ -1,7 +1,7 @@ --- openshift_storageclass_defaults: aws: - provisioner: kubernetes.io/aws-ebs + provisioner: aws-ebs name: gp2 parameters: type: gp2 @@ -9,9 +9,11 @@ openshift_storageclass_defaults: encrypted: 'false' gce: name: standard - provisioner: kubernetes.io/gce-pd - type: pd-standard + provisioner: gce-pd + parameters: + 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..172e2ac25 100644 --- a/roles/openshift_default_storage_class/tasks/main.yml +++ b/roles/openshift_default_storage_class/tasks/main.yml @@ -2,11 +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" - parameters: - type: "{{ openshift_storageclass_parameters.type | default('gp2') }}" - encrypted: "{{ openshift_storageclass_parameters.encrypted | default('false') | string }}" - kmsKeyId: "{{ openshift_storageclass_parameters.kmsKeyId | default('') }}" + default_storage_class: "{{ openshift_storageclass_default | default('true') | string}}" + parameters: "{{ openshift_storageclass_parameters }}" + provisioner: "{{ openshift_storageclass_provisioner }}" run_once: true |