From 42e5b2c6b681dd5132a283198e273990cbb8a168 Mon Sep 17 00:00:00 2001 From: Chris Wedgwood Date: Thu, 3 May 2018 00:25:29 +0000 Subject: [PATCH] gate: ceph; reuse fsid if it exists don't regenerate the ceph fsid if we already have one, this means we can have piecemeal use of the gate and developer scripts Change-Id: Ib988679a06151850226f30b9a6432fbe202f1514 --- tools/deployment/developer/ceph/040-ceph.sh | 2 +- tools/deployment/multinode/030-ceph.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/deployment/developer/ceph/040-ceph.sh b/tools/deployment/developer/ceph/040-ceph.sh index 9a4f916bdc..d8e570ea5e 100755 --- a/tools/deployment/developer/ceph/040-ceph.sh +++ b/tools/deployment/developer/ceph/040-ceph.sh @@ -23,7 +23,7 @@ done #NOTE: Deploy command : ${OSH_EXTRA_HELM_ARGS:=""} -uuidgen > /tmp/ceph-fs-uuid.txt +[ -s /tmp/ceph-fs-uuid.txt ] || uuidgen > /tmp/ceph-fs-uuid.txt CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)" #NOTE(portdirect): to use RBD devices with Ubuntu kernels < 4.5 this # should be set to 'hammer' diff --git a/tools/deployment/multinode/030-ceph.sh b/tools/deployment/multinode/030-ceph.sh index 3a7f542b62..7057316274 100755 --- a/tools/deployment/multinode/030-ceph.sh +++ b/tools/deployment/multinode/030-ceph.sh @@ -17,7 +17,7 @@ set -xe #NOTE: Deploy command -uuidgen > /tmp/ceph-fs-uuid.txt +[ -s /tmp/ceph-fs-uuid.txt ] || uuidgen > /tmp/ceph-fs-uuid.txt 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)"