diff --git a/ceph-client/templates/configmap-etc-client.yaml b/ceph-client/templates/configmap-etc-client.yaml index d7e18501cb..a927912e7d 100644 --- a/ceph-client/templates/configmap-etc-client.yaml +++ b/ceph-client/templates/configmap-etc-client.yaml @@ -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 -}} diff --git a/tools/deployment/armada/multinode/armada-ceph.yaml b/tools/deployment/armada/multinode/armada-ceph.yaml index 50abcff192..bcd9709a92 100644 --- a/tools/deployment/armada/multinode/armada-ceph.yaml +++ b/tools/deployment/armada/multinode/armada-ceph.yaml @@ -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: diff --git a/tools/deployment/armada/multinode/armada-osh.yaml b/tools/deployment/armada/multinode/armada-osh.yaml index 7d131befa9..fd89f3c811 100644 --- a/tools/deployment/armada/multinode/armada-osh.yaml +++ b/tools/deployment/armada/multinode/armada-osh.yaml @@ -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: diff --git a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh index 71ac287ac0..9b96d3809c 100755 --- a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh +++ b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh @@ -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 <