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

Code Issues Proposed changes

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

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