openstack/openstack-helm
Code Issues Proposed changes

gate: ceph; reuse fsid if it exists

Browse Source 
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
This commit is contained in:
Chris Wedgwood 2018-05-03 00:25:29 +00:00
parent e3e4b86970
commit 42e5b2c6b6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/deployment/developer/ceph/040-ceph.sh
View File

@ -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'

2
tools/deployment/multinode/030-ceph.sh
View File

@ -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)"