openstack/openstack-helm
Code Issues Proposed changes

Merge "gate: ceph; reuse fsid if it exists"

Browse Source
This commit is contained in:
Zuul 2018-05-04 15:23:07 +00:00 committed by Gerrit Code Review
commit ddc87f5e7d
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)"