From 69e3d4772b5b22e3bc80e969ecf5bf4e715c8840 Mon Sep 17 00:00:00 2001 From: Brianna Poulos Date: Thu, 22 Feb 2018 21:36:42 +0000 Subject: [PATCH] Revert "Remove duplicate configuration" This reverts commit 98c87a7383fb54b1bf31390ec7219c1b61024e94. Change-Id: I1b3fae128100655ab580be3d6c68285063e9a036 --- tools/pre_test_hook.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/pre_test_hook.sh b/tools/pre_test_hook.sh index f7820f8..f42bb93 100755 --- a/tools/pre_test_hook.sh +++ b/tools/pre_test_hook.sh @@ -16,22 +16,26 @@ echo -e '[[local|localrc]]' >> $LOCALCONF_PATH echo -e 'NOVA_BACKEND=LVM' >> $LOCALCONF_PATH echo -e 'LVM_VOLUME_CLEAR=none' >> $LOCALCONF_PATH -# For image signature verification tests +# Enable image signature verification in nova.conf echo -e '[[post-config|$NOVA_CONF]]' >> $LOCALCONF_PATH echo -e '[glance]' >> $LOCALCONF_PATH echo -e 'verify_glance_signatures = True' >> $LOCALCONF_PATH -# For ephemeral storage encryption tests +# Enable ephemeral storage encryption in nova.conf echo -e '[ephemeral_storage_encryption]' >> $LOCALCONF_PATH echo -e 'key_size = 256' >> $LOCALCONF_PATH echo -e 'cipher = aes-xts-plain64' >> $LOCALCONF_PATH echo -e 'enabled = True' >> $LOCALCONF_PATH # Allow dynamically created tempest users to create secrets -# in barbican +# in barbican in tempest.conf echo -e '[[test-config|$TEMPEST_CONFIG]]' >> $LOCALCONF_PATH echo -e '[auth]' >> $LOCALCONF_PATH echo -e 'tempest_roles=creator' >> $LOCALCONF_PATH # Glance v1 doesn't do signature verification on image upload echo -e '[image-feature-enabled]' >> $LOCALCONF_PATH echo -e 'api_v1=False' >> $LOCALCONF_PATH + +# Enable ephemeral storage encryption in tempest.conf +echo -e '[ephemeral_storage_encryption]' >> $LOCALCONF_PATH +echo -e 'enabled = True' >> $LOCALCONF_PATH