d9404f89c2
The current implementation of the Ceph CSI provisioner is tied too closely with the older Ceph RBD provisioner, which doesn't let the deployer deploy Ceph CSI provisioner without the old RBD provisioner. This patchset will decouple them such that they can be deployed independently from one another. A few other changes are needed as well: 1) The deployment/gate scripts are updated so that the old RBD and CSI RBD provisioners are separately enabled/disabled as needed. The original RBD provisioner is now deprecated. 2) Ceph-mon chart is updated because it had some RBD storageclass data in values.yaml that is not needed for ceph-mon deployment. 3) Fixed a couple of bugs in job-cephfs-client-key.yaml where RBD parameters were being used instead of cephfs parameters. Change-Id: Icb5f78dcefa51990baf1b6d92411eb641c2ea9e2
90 lines
2.6 KiB
Bash
Executable File
90 lines
2.6 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
set -xe
|
|
|
|
#NOTE: Deploy command
|
|
CEPH_PUBLIC_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)"
|
|
CEPH_CLUSTER_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)"
|
|
tee /tmp/tenant-ceph-openstack-config.yaml <<EOF
|
|
endpoints:
|
|
identity:
|
|
namespace: openstack
|
|
object_store:
|
|
namespace: openstack
|
|
ceph_mon:
|
|
namespace: tenant-ceph
|
|
port:
|
|
mon:
|
|
default: 6790
|
|
network:
|
|
public: ${CEPH_PUBLIC_NETWORK}
|
|
cluster: ${CEPH_CLUSTER_NETWORK}
|
|
deployment:
|
|
storage_secrets: false
|
|
ceph: false
|
|
rbd_provisioner: false
|
|
csi_rbd_provisioner: false
|
|
cephfs_provisioner: false
|
|
client_secrets: true
|
|
rgw_keystone_user_and_endpoints: false
|
|
bootstrap:
|
|
enabled: false
|
|
conf:
|
|
rgw_ks:
|
|
enabled: true
|
|
storageclass:
|
|
rbd:
|
|
provision_storage_class: true
|
|
metadata:
|
|
name: tenant-rbd
|
|
parameters:
|
|
adminSecretName: pvc-tenant-ceph-conf-combined-storageclass
|
|
adminSecretNamespace: tenant-ceph
|
|
userSecretName: pvc-tenant-ceph-client-key
|
|
csi_rbd:
|
|
ceph_configmap_name: tenant-ceph-etc
|
|
provision_storage_class: true
|
|
metadata:
|
|
name: tenant-csi-rbd
|
|
parameters:
|
|
adminSecretName: pvc-tenant-ceph-conf-combined-storageclass
|
|
adminSecretNamespace: tenant-ceph
|
|
userSecretName: pvc-tenant-ceph-client-key
|
|
cephfs:
|
|
provision_storage_class: true
|
|
metadata:
|
|
name: cephfs
|
|
parameters:
|
|
adminSecretName: pvc-tenant-ceph-conf-combined-storageclass
|
|
adminSecretNamespace: tenant-ceph
|
|
userSecretName: pvc-tenant-ceph-cephfs-client-key
|
|
EOF
|
|
|
|
: ${OSH_INFRA_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE:="$(./tools/deployment/common/get-values-overrides.sh ceph-provisioners)"}
|
|
|
|
helm upgrade --install tenant-ceph-openstack-config ./ceph-provisioners \
|
|
--namespace=openstack \
|
|
--values=/tmp/tenant-ceph-openstack-config.yaml \
|
|
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
|
${OSH_INFRA_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
|
|
|
|
#NOTE: Wait for deploy
|
|
./tools/deployment/common/wait-for-pods.sh openstack
|
|
|
|
#NOTE: Validate Deployment info
|
|
helm status tenant-ceph-openstack-config
|
|
|
|
helm test tenant-ceph-openstack-config --timeout 600
|