From 7b6685befdf0df46fafaa87b0c2f897118d9f280 Mon Sep 17 00:00:00 2001 From: dave kormann Date: Fri, 12 Jan 2018 13:44:28 -0500 Subject: [PATCH] Disable cephfs_provisioner deployment in openstack namespace As with the rbd_provisioner deployment, cephfs_provisioner should only be deployed to the ceph namespace. This change just disables that deployment in the openstack namespace. Change-Id: Idfec8fbdd9408bd292d8770a3690b1b77de2b22d --- doc/source/install/multinode.rst | 2 ++ tools/gate/launch-osh/basic.sh | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/doc/source/install/multinode.rst b/doc/source/install/multinode.rst index 188fa79add..1d3a1dc606 100644 --- a/doc/source/install/multinode.rst +++ b/doc/source/install/multinode.rst @@ -310,6 +310,7 @@ running the following commands in the ``openstack-helm`` project folder: --set deployment.storage_secrets=true \ --set deployment.ceph=true \ --set deployment.rbd_provisioner=true \ + --set deployment.cephfs_provisioner=true \ --set deployment.client_secrets=false \ --set deployment.rgw_keystone_user_and_endpoints=false \ --set bootstrap.enabled=true @@ -351,6 +352,7 @@ deploy the client keyring and ``ceph.conf`` to the ``openstack`` namespace: --set deployment.storage_secrets=false \ --set deployment.ceph=false \ --set deployment.rbd_provisioner=false \ + --set deployment.cephfs_provisioner=false \ --set deployment.client_secrets=true \ --set deployment.rgw_keystone_user_and_endpoints=false diff --git a/tools/gate/launch-osh/basic.sh b/tools/gate/launch-osh/basic.sh index 9dad6ffd4b..a8c0bb0994 100755 --- a/tools/gate/launch-osh/basic.sh +++ b/tools/gate/launch-osh/basic.sh @@ -40,6 +40,7 @@ if [ "x$PVC_BACKEND" == "xceph" ]; then --set deployment.storage_secrets=true \ --set deployment.ceph=true \ --set deployment.rbd_provisioner=true \ + --set deployment.cephfs_provisioner=true \ --set deployment.client_secrets=false \ --set deployment.rgw_keystone_user_and_endpoints=false \ --set bootstrap.enabled=true \ @@ -55,6 +56,7 @@ if [ "x$PVC_BACKEND" == "xceph" ]; then --set deployment.storage_secrets=true \ --set deployment.ceph=true \ --set deployment.rbd_provisioner=true \ + --set deployment.cephfs_provisioner=true \ --set deployment.client_secrets=false \ --set deployment.rgw_keystone_user_and_endpoints=false \ --set bootstrap.enabled=true @@ -80,6 +82,7 @@ if [ "x$PVC_BACKEND" == "xceph" ]; then --set deployment.storage_secrets=false \ --set deployment.ceph=false \ --set deployment.rbd_provisioner=false \ + --set deployment.cephfs_provisioner=false \ --set deployment.client_secrets=true \ --set deployment.rgw_keystone_user_and_endpoints=false @@ -114,6 +117,7 @@ if [ "x$OPENSTACK_OBJECT_STORAGE" == "xradosgw" ]; then --set deployment.storage_secrets=false \ --set deployment.ceph=false \ --set deployment.rbd_provisioner=false \ + --set deployment.cephfs_provisioner=false \ --set deployment.client_secrets=false \ --set deployment.rgw_keystone_user_and_endpoints=true kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}