openstack/openstack-helm
Code Issues Proposed changes

Merge "gate: remove fsid from charts that don't use it"

Browse Source
This commit is contained in:
Zuul 2018-05-09 20:44:33 +00:00 committed by Gerrit Code Review
commit 0f5d23221d
7 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceph-client/templates/configmap-etc-client.yaml
View File

@ -26,10 +26,6 @@ limitations under the License.
{{- $monHost | set .Values.conf.ceph.global "mon_host" | quote | trunc 0 -}}
{{- end -}}
{{- if empty .Values.conf.ceph.global.fsid -}}
{{- uuidv4 | set .Values.conf.ceph.global "fsid" | quote | trunc 0 -}}
{{- end -}}
{{- if empty .Values.conf.ceph.osd.cluster_network -}}
{{- .Values.network.cluster | set .Values.conf.ceph.osd "cluster_network" | quote | trunc 0 -}}
{{- end -}}

5
tools/deployment/armada/multinode/armada-ceph.yaml
View File

@ -228,11 +228,6 @@ data:
bootstrap:
enabled: true
conf:
ceph:
global:
#NOTE (portdirect): any uuidv4 value is acceptable here, though must
# be consistent if you wish to redploy whist maintaining data.
fsid: C1150D08-707D-4FEB-85E7-692BD9206DC3
rgw_ks:
enabled: true
pool:

5
tools/deployment/armada/multinode/armada-osh.yaml
View File

@ -114,11 +114,6 @@ data:
bootstrap:
enabled: false
conf:
ceph:
global:
#NOTE (portdirect): any uuidv4 value is acceptable here, though must
# be consistent if you wish to redploy whist maintaining data.
fsid: C1150D08-707D-4FEB-85E7-692BD9206DC3
rgw_ks:
enabled: true
source:

4
tools/deployment/developer/ceph/045-ceph-ns-activate.sh
View File

@ -21,7 +21,6 @@ make ceph-client
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
tee /tmp/ceph-openstack-config.yaml <<EOF
endpoints:
identity:
@ -45,9 +44,6 @@ bootstrap:
conf:
rgw_ks:
enabled: true
ceph:
global:
fsid: ${CEPH_FS_ID}
EOF
helm upgrade --install ceph-openstack-config ./ceph-client \
--namespace=openstack \

4
tools/deployment/developer/ceph/110-ceph-radosgateway.sh
View File

@ -21,7 +21,6 @@ make ceph
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
tee /tmp/radosgw-openstack.yaml <<EOF
endpoints:
identity:
@ -45,9 +44,6 @@ bootstrap:
conf:
rgw_ks:
enabled: true
ceph:
global:
fsid: ${CEPH_FS_ID}
EOF
helm upgrade --install radosgw-openstack ./ceph-client \
--namespace=openstack \

4
tools/deployment/multinode/040-ceph-ns-activate.sh
View File

@ -19,7 +19,6 @@ 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)"
CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
tee /tmp/ceph-openstack-config.yaml <<EOF
endpoints:
identity:
@ -41,9 +40,6 @@ deployment:
bootstrap:
enabled: false
conf:
ceph:
global:
fsid: ${CEPH_FS_ID}
rgw_ks:
enabled: true
EOF

4
tools/deployment/multinode/090-ceph-radosgateway.sh
View File

@ -19,7 +19,6 @@ 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)"
CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
tee /tmp/radosgw-openstack.yaml <<EOF
endpoints:
identity:
@ -41,9 +40,6 @@ deployment:
bootstrap:
enabled: false
conf:
ceph:
global:
fsid: ${CEPH_FS_ID}
rgw_ks:
enabled: true
EOF