From 9ffadd7ee6706ae04ae8f2eb1e847d47ae849257 Mon Sep 17 00:00:00 2001
From: Liang Fang <liang.a.fang@intel.com>
Date: Sat, 30 May 2020 15:35:41 +0000
Subject: [PATCH] Correctly set nova-cpu.conf and tempest flag

1. Fix bug in setting up open-cas in nova-cpu.conf
2. Move volume_local_cache flag to test-config

Change-Id: Ic0684500ed2d5c278629f93ce836a9f34745dad3
---
 devstack/override-defaults |  1 +
 devstack/plugin.sh         | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 devstack/override-defaults

diff --git a/devstack/override-defaults b/devstack/override-defaults
new file mode 100644
index 0000000..2fb240e
--- /dev/null
+++ b/devstack/override-defaults
@@ -0,0 +1 @@
+ENABLE_VOLUME_LOCAL_CACHE=$(trueorfalse False ENABLE_VOLUME_LOCAL_CACHE)
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index bb0ca10..40bad59 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -81,10 +81,19 @@ if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
     echo_summary "create cache instance"
     create_cache_instance
 elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
-    # configure open-cas in /path/to/nova-cpu.conf
-    iniset $NOVA_CPU_CONF compute volume_local_cache_driver opencas
-    iniset $NOVA_CPU_CONF compute volume_local_cache_instance_ids 1
-    iniset $TEMPEST_CONFIG volume-feature-enabled volume_local_cache True
+    # Configure open-cas in nova-cpu.conf. Cannot set in below way because
+    # $NOVA_CPU_CONF will be overwritten in starting Nova phase. Refer to
+    # devstack/lib/nova, function start_nova_compute()
+    # iniset $NOVA_CPU_CONF compute volume_local_cache_driver opencas
+    # iniset $NOVA_CPU_CONF compute volume_local_cache_instance_ids 1
+    if [[ $ENABLE_VOLUME_LOCAL_CACHE == "True" ]]; then
+        localconf_set $TOP_DIR/local.conf post-config \$NOVA_CPU_CONF compute volume_local_cache_driver opencas
+        localconf_set $TOP_DIR/local.conf post-config \$NOVA_CPU_CONF compute volume_local_cache_instance_ids 1
+    fi
+elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
+    if [[ $ENABLE_VOLUME_LOCAL_CACHE == "True" ]]; then
+        iniset $TEMPEST_CONFIG volume-feature-enabled volume_local_cache True
+    fi
 fi
 
 if [[ "$1" == "unstack" ]]; then