From 324d95f03c808c2944ab9dafd0ae6788c6937845 Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Thu, 3 May 2018 00:34:35 +0000
Subject: [PATCH] gate: remove fsid from charts that don't use it

Change-Id: I158c072e7a97a1005ff795dae4638e0cd539c197
---
 ceph-client/templates/configmap-etc-client.yaml          | 4 ----
 tools/deployment/armada/multinode/armada-ceph.yaml       | 5 -----
 tools/deployment/armada/multinode/armada-osh.yaml        | 5 -----
 tools/deployment/developer/ceph/045-ceph-ns-activate.sh  | 4 ----
 tools/deployment/developer/ceph/110-ceph-radosgateway.sh | 4 ----
 tools/deployment/multinode/040-ceph-ns-activate.sh       | 4 ----
 tools/deployment/multinode/090-ceph-radosgateway.sh      | 4 ----
 7 files changed, 30 deletions(-)

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 5660ae575a..ea95624e0b 100644
--- a/tools/deployment/armada/multinode/armada-osh.yaml
+++ b/tools/deployment/armada/multinode/armada-osh.yaml
@@ -110,11 +110,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 b00aa1f6b5..e40b33fdd6 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 pull-images 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 \
diff --git a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
index c2486b38a6..59f88915d3 100755
--- a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
+++ b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
@@ -21,7 +21,6 @@ make pull-images 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 \
diff --git a/tools/deployment/multinode/040-ceph-ns-activate.sh b/tools/deployment/multinode/040-ceph-ns-activate.sh
index f4b01a969d..c4fb8ff576 100755
--- a/tools/deployment/multinode/040-ceph-ns-activate.sh
+++ b/tools/deployment/multinode/040-ceph-ns-activate.sh
@@ -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
diff --git a/tools/deployment/multinode/090-ceph-radosgateway.sh b/tools/deployment/multinode/090-ceph-radosgateway.sh
index 1e38f55844..515a273591 100755
--- a/tools/deployment/multinode/090-ceph-radosgateway.sh
+++ b/tools/deployment/multinode/090-ceph-radosgateway.sh
@@ -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