From c77492ab79a2d0845e0b71c10a4bf898bd026042 Mon Sep 17 00:00:00 2001 From: Matthew Wong Date: Thu, 15 Sep 2016 15:41:05 -0400 Subject: [PATCH 1/2] Update gluster provisioner parameters --- docs/user-guide/persistent-volumes/index.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/user-guide/persistent-volumes/index.md b/docs/user-guide/persistent-volumes/index.md index 8f6bf30a25..48b5f2c630 100644 --- a/docs/user-guide/persistent-volumes/index.md +++ b/docs/user-guide/persistent-volumes/index.md @@ -365,7 +365,7 @@ parameters: #### GLUSTERFS ```yaml -apiVersion: extensions/v1beta1 +apiVersion: storage.k8s.io/v1beta1 kind: StorageClass metadata: name: slow @@ -373,14 +373,16 @@ provisioner: kubernetes.io/glusterfs parameters: endpoint: "glusterfs-cluster" resturl: "http://127.0.0.1:8081" + restauthenabled: "true" restuser: "admin" restuserkey: "password" ``` * `endpoint`: `glusterfs-cluster` is the endpoint/service name which includes GlusterFS trusted pool IP addresses and this parameter is mandatory. -* `resturl` : Gluster REST service url which provision gluster volumes on demand. The format should be a valid URL and this is a mandatory parameter for GlusterFS dynamic provisioner. -* `restuser` : Gluster REST service user who has access to create volumes in the Gluster Trusted Pool. This parameter is optional, empty string will be used when omitted. -* `restuserkey` : Gluster REST service user's password which will be used for authentication to the REST server. This parameter is optional, empty string will be used when omitted. +* `resturl` : Gluster REST service url which provisions gluster volumes on demand. The format should be `IPaddress:Port` and this parameter is mandatory when using the GlusterFS dynamic provisioner. +* `restauthenabled` : A boolean value that indicates whether Gluster REST service authentication is enabled on the REST server. If this value is 'true', you must supply values for the 'restuser' and 'restuserkey' parameters." +* `restuser` : Gluster REST service user, who has access to create volumes in the Gluster Trusted Pool. +* `restuserkey` : Gluster REST service user's password, will be used for authentication to the REST server. #### OpenStack Cinder From 93afc4cb00cb9a0bcfeb8dcedf500f3287a99d02 Mon Sep 17 00:00:00 2001 From: Matthew Wong Date: Thu, 22 Sep 2016 11:22:02 -0400 Subject: [PATCH 2/2] Add protocol to resturl format --- docs/user-guide/persistent-volumes/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/persistent-volumes/index.md b/docs/user-guide/persistent-volumes/index.md index 48b5f2c630..e16954a2f1 100644 --- a/docs/user-guide/persistent-volumes/index.md +++ b/docs/user-guide/persistent-volumes/index.md @@ -379,7 +379,7 @@ parameters: ``` * `endpoint`: `glusterfs-cluster` is the endpoint/service name which includes GlusterFS trusted pool IP addresses and this parameter is mandatory. -* `resturl` : Gluster REST service url which provisions gluster volumes on demand. The format should be `IPaddress:Port` and this parameter is mandatory when using the GlusterFS dynamic provisioner. +* `resturl` : Gluster REST service url which provisions gluster volumes on demand. The format should be `http://IPaddress:Port` and this parameter is mandatory when using the GlusterFS dynamic provisioner. * `restauthenabled` : A boolean value that indicates whether Gluster REST service authentication is enabled on the REST server. If this value is 'true', you must supply values for the 'restuser' and 'restuserkey' parameters." * `restuser` : Gluster REST service user, who has access to create volumes in the Gluster Trusted Pool. * `restuserkey` : Gluster REST service user's password, will be used for authentication to the REST server.