diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-31 03:56:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 03:56:02 -0700 |
| commit | dd5cee2a152437ae1afc3a9574451cc7c1475d2b (patch) | |
| tree | 30cb0e23d72f7e04b6f54395981e19ee1ba45fff | |
| parent | 34a155225c218bab17a3902841f950065015947b (diff) | |
| parent | fd759f512873f4be929c3e8a401b7b0395206e88 (diff) | |
| download | openshift-dd5cee2a152437ae1afc3a9574451cc7c1475d2b.tar.gz openshift-dd5cee2a152437ae1afc3a9574451cc7c1475d2b.tar.bz2 openshift-dd5cee2a152437ae1afc3a9574451cc7c1475d2b.tar.xz openshift-dd5cee2a152437ae1afc3a9574451cc7c1475d2b.zip | |
Merge pull request #5722 from qinpingli/sc_openstack
Automatic merge from submit-queue.
Create default storageclass for cloudprovider openstack
With this patch, a default storageclass will be created on openstack cloudprovider after installation.
3 files changed, 8 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_default_storage_class.yml b/playbooks/common/openshift-cluster/openshift_default_storage_class.yml index 4b4f19690..62fe0dd60 100644 --- a/playbooks/common/openshift-cluster/openshift_default_storage_class.yml +++ b/playbooks/common/openshift-cluster/openshift_default_storage_class.yml @@ -3,4 +3,4 @@ hosts: oo_first_master roles: - role: openshift_default_storage_class - when: openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce') + when: openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce' or openshift_cloudprovider_kind == 'openstack') diff --git a/roles/openshift_default_storage_class/defaults/main.yml b/roles/openshift_default_storage_class/defaults/main.yml index bdece7640..014c06641 100644 --- a/roles/openshift_default_storage_class/defaults/main.yml +++ b/roles/openshift_default_storage_class/defaults/main.yml @@ -13,6 +13,12 @@ openshift_storageclass_defaults: parameters: type: pd-standard + openstack: + name: standard + provisioner: cinder + parameters: + fstype: xfs + openshift_storageclass_default: "true" openshift_storageclass_name: "{{ openshift_storageclass_defaults[openshift_cloudprovider_kind]['name'] }}" openshift_storageclass_provisioner: "{{ openshift_storageclass_defaults[openshift_cloudprovider_kind]['provisioner'] }}" diff --git a/roles/openshift_default_storage_class/tasks/main.yml b/roles/openshift_default_storage_class/tasks/main.yml index 172e2ac25..281ec8ed5 100644 --- a/roles/openshift_default_storage_class/tasks/main.yml +++ b/roles/openshift_default_storage_class/tasks/main.yml @@ -1,5 +1,5 @@ --- -# Install default storage classes in GCE & AWS +# Install default storage classes in GCE & AWS & OPENSTACK - name: Ensure storageclass object oc_storageclass: name: "{{ openshift_storageclass_name }}" |