From f4a2d002b374c3b6e8ed31abf2f977f75815ddeb Mon Sep 17 00:00:00 2001 From: Ping Qin Date: Mon, 9 Oct 2017 16:00:45 +0800 Subject: Create default storageclass for cloudprovider openstack --- .../common/openshift-cluster/openshift_default_storage_class.yml | 2 +- roles/openshift_default_storage_class/defaults/main.yml | 6 ++++++ roles/openshift_default_storage_class/tasks/main.yml | 2 +- 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..b9290c886 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: sc-cinder + 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 }}" -- cgit v1.2.3 From fd759f512873f4be929c3e8a401b7b0395206e88 Mon Sep 17 00:00:00 2001 From: Ping Qin Date: Mon, 30 Oct 2017 11:18:24 +0800 Subject: Modify StorageClass name to standard --- roles/openshift_default_storage_class/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/openshift_default_storage_class/defaults/main.yml b/roles/openshift_default_storage_class/defaults/main.yml index b9290c886..014c06641 100644 --- a/roles/openshift_default_storage_class/defaults/main.yml +++ b/roles/openshift_default_storage_class/defaults/main.yml @@ -14,7 +14,7 @@ openshift_storageclass_defaults: type: pd-standard openstack: - name: sc-cinder + name: standard provisioner: cinder parameters: fstype: xfs -- cgit v1.2.3