diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-07-03 16:33:30 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-07-14 08:47:22 -0400 |
| commit | d3cd981326c98984117ae6fd768d63c39257de69 (patch) | |
| tree | 3e67f4485f29bb4885566959d0f5db06d027643d /roles/openshift_default_storage_class | |
| parent | 0b0a7af456c8786dace49bb38ecf462c8f3336c3 (diff) | |
| download | openshift-d3cd981326c98984117ae6fd768d63c39257de69.tar.gz openshift-d3cd981326c98984117ae6fd768d63c39257de69.tar.bz2 openshift-d3cd981326c98984117ae6fd768d63c39257de69.tar.xz openshift-d3cd981326c98984117ae6fd768d63c39257de69.zip | |
Adding storageclass support to lib_openshift.
Diffstat (limited to 'roles/openshift_default_storage_class')
| -rw-r--r-- | roles/openshift_default_storage_class/defaults/main.yml | 9 | ||||
| -rw-r--r-- | roles/openshift_default_storage_class/tasks/main.yml | 19 |
2 files changed, 12 insertions, 16 deletions
diff --git a/roles/openshift_default_storage_class/defaults/main.yml b/roles/openshift_default_storage_class/defaults/main.yml index 66ffd2a73..bda83c933 100644 --- a/roles/openshift_default_storage_class/defaults/main.yml +++ b/roles/openshift_default_storage_class/defaults/main.yml @@ -1,9 +1,12 @@ --- openshift_storageclass_defaults: aws: - name: gp2 provisioner: kubernetes.io/aws-ebs - type: gp2 + name: gp2 + parameters: + type: gp2 + kmsKeyId: '' + encrypted: 'false' gce: name: standard provisioner: kubernetes.io/gce-pd @@ -11,4 +14,4 @@ openshift_storageclass_defaults: openshift_storageclass_name: "{{ openshift_storageclass_defaults[openshift_cloudprovider_kind]['name'] }}" openshift_storageclass_provisioner: "{{ openshift_storageclass_defaults[openshift_cloudprovider_kind]['provisioner'] }}" -openshift_storageclass_type: "{{ openshift_storageclass_defaults[openshift_cloudprovider_kind]['type'] }}" +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 408fc17c7..fd5e4fabe 100644 --- a/roles/openshift_default_storage_class/tasks/main.yml +++ b/roles/openshift_default_storage_class/tasks/main.yml @@ -1,19 +1,12 @@ --- # Install default storage classes in GCE & AWS - name: Ensure storageclass object - oc_obj: + oc_storageclass: kind: storageclass name: "{{ openshift_storageclass_name }}" - content: - path: /tmp/openshift_storageclass - data: - kind: StorageClass - apiVersion: storage.k8s.io/v1beta1 - metadata: - name: "{{ openshift_storageclass_name }}" - annotations: - storageclass.beta.kubernetes.io/is-default-class: "true" - provisioner: "{{ openshift_storageclass_provisioner }}" - parameters: - type: "{{ openshift_storageclass_type }}" + 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('') }}" run_once: true |