From c6d3b842685c06fed0bfeeef30b18332c5abdd07 Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Tue, 22 May 2018 13:29:47 -0400
Subject: [PATCH] Test attach encrypted volume

Enable encrypted volume testing.

Change-Id: I96739a3592241aff6326662d15f36b39f1772356
---
 .zuul.yaml            | 6 ++----
 devstack/lib/ceph     | 9 ++++++---
 tempest_blacklist.txt | 3 +++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 78acb67..333f7f2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -23,8 +23,7 @@
       tox_envlist: all
       tempest_test_regex: |
               (^tempest\.(api|scenario)|(^cinder_tempest_plugin))
-      tempest_test_blacklist: |
-              "{{ ansible_user_dir }}/src/git.openstack.org/openstack/devstack-plugin-ceph/tempest_blacklist.txt"
+      tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tempest_blacklist.txt'
 
 - job:
     name: devstack-plugin-ceph-tempest-py3
@@ -49,8 +48,7 @@
       tox_envlist: all
       tempest_test_regex: |
               (^tempest\.(api|scenario)|(^cinder_tempest_plugin))
-      tempest_test_blacklist: |
-              "{{ ansible_user_dir }}/openstack/devstack-plugin-ceph/tempest_blacklist.txt"
+      tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tempest_blacklist.txt'
 
 - project-template:
     name: devstack-plugin-ceph-tempest-jobs
diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index a889214..0c77c3c 100644
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -119,9 +119,12 @@ 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)
 
-# Cinder encrypted volume tests are not supported with a Ceph backend due to
-# bug 1463525.
-ATTACH_ENCRYPTED_VOLUME_AVAILABLE=False
+if [[ "$TARGET_BRANCH" == "master" ]]; then
+    # TODO: enable this for Queens and later
+    ATTACH_ENCRYPTED_VOLUME_AVAILABLE=True
+else
+    ATTACH_ENCRYPTED_VOLUME_AVAILABLE=False
+fi
 
 # OpenStack CI test instances will have a set of opt in package mirrors in
 # /etc/apt/sources.list.available.d/ which will include the ceph package
diff --git a/tempest_blacklist.txt b/tempest_blacklist.txt
index c2155dc..bbab5ae 100644
--- a/tempest_blacklist.txt
+++ b/tempest_blacklist.txt
@@ -1,2 +1,5 @@
 # List of tests getting skipped
 .*\[.*\bslow\b.*\]
+
+# The RBD driver only supports LUKS encryption.
+tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes.test_encrypted_cinder_volumes_cryptsetup