Ceph-RGW - Update chart install scripts
- As part of PS 634782, Ceph-rgw chart was updated. We need to update Ceph chart install script as per new changes. Change-Id: Ieede912272903ed251693879f17a821cb2a4e7bb
This commit is contained in:
parent
dc247b3856
commit
092d7103ab
@ -132,7 +132,6 @@ Update script with following overrides.
|
|||||||
rbd_provisioner: true
|
rbd_provisioner: true
|
||||||
cephfs_provisioner: false
|
cephfs_provisioner: false
|
||||||
client_secrets: false
|
client_secrets: false
|
||||||
rgw_keystone_user_and_endpoints: false
|
|
||||||
endpoints:
|
endpoints:
|
||||||
ceph_mon:
|
ceph_mon:
|
||||||
namespace: ceph
|
namespace: ceph
|
||||||
@ -532,7 +531,6 @@ Update script's override section with following:
|
|||||||
rbd_provisioner: false
|
rbd_provisioner: false
|
||||||
cephfs_provisioner: false
|
cephfs_provisioner: false
|
||||||
client_secrets: false
|
client_secrets: false
|
||||||
rgw_keystone_user_and_endpoints: false
|
|
||||||
labels:
|
labels:
|
||||||
mon:
|
mon:
|
||||||
node_selector_key: ceph-mon-tenant
|
node_selector_key: ceph-mon-tenant
|
||||||
@ -639,7 +637,6 @@ Update script as following:
|
|||||||
rbd_provisioner: false
|
rbd_provisioner: false
|
||||||
cephfs_provisioner: false
|
cephfs_provisioner: false
|
||||||
client_secrets: true
|
client_secrets: true
|
||||||
rgw_keystone_user_and_endpoints: false
|
|
||||||
bootstrap:
|
bootstrap:
|
||||||
enabled: false
|
enabled: false
|
||||||
conf:
|
conf:
|
||||||
@ -703,7 +700,6 @@ Update script with following overrides:
|
|||||||
rbd_provisioner: false
|
rbd_provisioner: false
|
||||||
cephfs_provisioner: false
|
cephfs_provisioner: false
|
||||||
client_secrets: false
|
client_secrets: false
|
||||||
rgw_keystone_user_and_endpoints: true
|
|
||||||
bootstrap:
|
bootstrap:
|
||||||
enabled: false
|
enabled: false
|
||||||
conf:
|
conf:
|
||||||
|
@ -411,7 +411,6 @@ data:
|
|||||||
rbd_provisioner: False
|
rbd_provisioner: False
|
||||||
cephfs_provisioner: False
|
cephfs_provisioner: False
|
||||||
client_secrets: False
|
client_secrets: False
|
||||||
rgw_keystone_user_and_endpoints: True
|
|
||||||
source:
|
source:
|
||||||
type: local
|
type: local
|
||||||
location: ${OSH_INFRA_PATH}
|
location: ${OSH_INFRA_PATH}
|
||||||
|
@ -26,27 +26,18 @@ make -C ${HELM_CHART_ROOT_PATH} ceph-provisioners
|
|||||||
#NOTE: Deploy command
|
#NOTE: Deploy command
|
||||||
tee /tmp/ceph-openstack-config.yaml <<EOF
|
tee /tmp/ceph-openstack-config.yaml <<EOF
|
||||||
endpoints:
|
endpoints:
|
||||||
identity:
|
|
||||||
namespace: openstack
|
|
||||||
object_store:
|
|
||||||
namespace: ceph
|
|
||||||
ceph_mon:
|
ceph_mon:
|
||||||
namespace: ceph
|
namespace: ceph
|
||||||
network:
|
network:
|
||||||
public: 172.17.0.1/16
|
public: 172.17.0.1/16
|
||||||
cluster: 172.17.0.1/16
|
cluster: 172.17.0.1/16
|
||||||
deployment:
|
deployment:
|
||||||
storage_secrets: false
|
|
||||||
ceph: false
|
ceph: false
|
||||||
rbd_provisioner: false
|
rbd_provisioner: false
|
||||||
cephfs_provisioner: false
|
cephfs_provisioner: false
|
||||||
client_secrets: true
|
client_secrets: true
|
||||||
rgw_keystone_user_and_endpoints: false
|
|
||||||
bootstrap:
|
bootstrap:
|
||||||
enabled: false
|
enabled: false
|
||||||
conf:
|
|
||||||
rgw_ks:
|
|
||||||
enabled: true
|
|
||||||
EOF
|
EOF
|
||||||
helm upgrade --install ceph-openstack-config ${HELM_CHART_ROOT_PATH}/ceph-provisioners \
|
helm upgrade --install ceph-openstack-config ${HELM_CHART_ROOT_PATH}/ceph-provisioners \
|
||||||
--namespace=openstack \
|
--namespace=openstack \
|
||||||
|
@ -36,14 +36,6 @@ else
|
|||||||
fi
|
fi
|
||||||
tee /tmp/ceph.yaml <<EOF
|
tee /tmp/ceph.yaml <<EOF
|
||||||
endpoints:
|
endpoints:
|
||||||
identity:
|
|
||||||
namespace: openstack
|
|
||||||
object_store:
|
|
||||||
namespace: ceph
|
|
||||||
port:
|
|
||||||
api:
|
|
||||||
default: 8088
|
|
||||||
public: 80
|
|
||||||
ceph_mon:
|
ceph_mon:
|
||||||
namespace: ceph
|
namespace: ceph
|
||||||
port:
|
port:
|
||||||
@ -65,7 +57,6 @@ deployment:
|
|||||||
rbd_provisioner: true
|
rbd_provisioner: true
|
||||||
cephfs_provisioner: true
|
cephfs_provisioner: true
|
||||||
client_secrets: false
|
client_secrets: false
|
||||||
rgw_keystone_user_and_endpoints: false
|
|
||||||
bootstrap:
|
bootstrap:
|
||||||
enabled: true
|
enabled: true
|
||||||
conf:
|
conf:
|
||||||
|
@ -35,7 +35,6 @@ network:
|
|||||||
cluster: 172.17.0.1/16
|
cluster: 172.17.0.1/16
|
||||||
deployment:
|
deployment:
|
||||||
ceph: true
|
ceph: true
|
||||||
rgw_keystone_user_and_endpoints: true
|
|
||||||
bootstrap:
|
bootstrap:
|
||||||
enabled: false
|
enabled: false
|
||||||
conf:
|
conf:
|
||||||
|
@ -32,7 +32,6 @@ network:
|
|||||||
cluster: ${CEPH_CLUSTER_NETWORK}
|
cluster: ${CEPH_CLUSTER_NETWORK}
|
||||||
deployment:
|
deployment:
|
||||||
ceph: true
|
ceph: true
|
||||||
rgw_keystone_user_and_endpoints: true
|
|
||||||
bootstrap:
|
bootstrap:
|
||||||
enabled: false
|
enabled: false
|
||||||
conf:
|
conf:
|
||||||
|
Loading…
Reference in New Issue
Block a user