openstack/devstack-plugin-ceph
Code Issues Proposed changes

Merge "Enable encrypted volume attachment on non-master branch"

Browse Source
This commit is contained in:
Zuul
2020-05-21 22:59:38 +00:00
committed by Gerrit Code Review
parent a75eaf6ede 3987d1d673
commit 8d23cc6621
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/lib/ceph
View File

@@ -133,10 +133,8 @@ REMOTE_CEPH_ADMIN_KEY_PATH=\
${REMOTE_CEPH_ADMIN_KEY_PATH:-$CEPH_CONF_DIR/ceph.client.admin.keyring}
REMOTE_CEPH_RGW=$(trueorfalse False REMOTE_CEPH_RGW)
if [[ "$TARGET_BRANCH" == "master" ]]; then
# TODO: enable this for Queens and later
ATTACH_ENCRYPTED_VOLUME_AVAILABLE=True
else
if [[ "$TARGET_BRANCH" =~ stable/(ocata|pike) ]]; then
# not supported before Queens
ATTACH_ENCRYPTED_VOLUME_AVAILABLE=False
fi