From fe3e41f34e962b54971a4572239f641fd9a9db8d Mon Sep 17 00:00:00 2001
From: Pino de Candia <giuseppe.decandia@gmail.com>
Date: Thu, 8 Mar 2018 21:37:04 +0000
Subject: [PATCH] Tatu should be last plugin in local.conf; write vendordata
 config to NOVA_CONF, not NOVA_CPU_CONF.

Change-Id: Iba80bc8452bf9726b7b861eaec2ac25d85e4e93e
Signed-off-by: Pino de Candia <giuseppe.decandia@gmail.com>
---
 devstack/local-df.conf |  4 +++-
 devstack/local.conf    |  3 ++-
 devstack/plugin.sh     | 24 ++++++++++++------------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/devstack/local-df.conf b/devstack/local-df.conf
index 82d2c3f..14d9612 100644
--- a/devstack/local-df.conf
+++ b/devstack/local-df.conf
@@ -6,10 +6,12 @@ SERVICE_PASSWORD=pinot
 SERVICE_TOKEN=pinot
 ADMIN_PASSWORD=pinot
 
-enable_plugin tatu https://git.openstack.org/openstack/tatu
 enable_plugin designate https://git.openstack.org/openstack/designate
 enable_plugin barbican https://git.openstack.org/openstack/barbican
 enable_plugin dragonflow https://github.com/pinodeca/dragonflow tatu
+# List tatu after barbican, designate, and dragonflow - tatu's startup depends on theirs
+enable_plugin tatu https://git.openstack.org/openstack/tatu
+
 enable_service df-redis
 enable_service df-redis-server
 enable_service df-controller
diff --git a/devstack/local.conf b/devstack/local.conf
index 9fe31ff..e19f6bb 100644
--- a/devstack/local.conf
+++ b/devstack/local.conf
@@ -6,9 +6,10 @@ SERVICE_PASSWORD=pinot
 SERVICE_TOKEN=pinot
 ADMIN_PASSWORD=pinot
 
-enable_plugin tatu https://git.openstack.org/openstack/tatu
 enable_plugin designate https://git.openstack.org/openstack/designate
 enable_plugin barbican https://git.openstack.org/openstack/barbican
+# List tatu after barbican and designate - tatu's startup depends on theirs
+enable_plugin tatu https://git.openstack.org/openstack/tatu
 
 Q_USE_PROVIDERNET_FOR_PUBLIC=True
 Q_FLOATING_ALLOCATION_POOL=start=172.24.4.10,end=172.24.4.200
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 043e2bc..7f7348f 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -57,21 +57,21 @@ function configure_tatu {
     iniset $KEYSTONE_CONF oslo_messaging_notifications topics notifications,tatu_notifications
     iniset $NOVA_CONF oslo_messaging_notifications topics notifications,tatu_notifications
 
-    iniset $NOVA_CPU_CONF DEFAULT force_config_drive TRUE
+    iniset $NOVA_CONF DEFAULT force_config_drive TRUE
 
     # Set up Tatu static vendor data.
     $TATU_DIR/scripts/cloud-config-to-vendor-data $TATU_DIR/files/user-cloud-config > $NOVA_CONF_DIR/tatu_static_vd.json
-    iniset $NOVA_CPU_CONF api vendordata_providers StaticJSON,DynamicJSON
-    iniset $NOVA_CPU_CONF api vendordata_jsonfile_path $NOVA_CONF_DIR/tatu_static_vd.json
-    iniset $NOVA_CPU_CONF api vendordata_dynamic_targets tatu@$TATU_SERVICE_PROTOCOL://$TATU_SERVICE_HOST:$TATU_SERVICE_PORT/novavendordata
-    iniset $NOVA_CPU_CONF api vendordata_dynamic_connect_timeout 5
-    iniset $NOVA_CPU_CONF api vendordata_dynamic_read_timeout 30
-    iniset $NOVA_CPU_CONF vendordata_dynamic_auth auth_url $KEYSTONE_SERVICE_URI
-    iniset $NOVA_CPU_CONF vendordata_dynamic_auth auth_type password
-    iniset $NOVA_CPU_CONF vendordata_dynamic_auth username admin
-    iniset $NOVA_CPU_CONF vendordata_dynamic_auth password $ADMIN_PASSWORD
-    iniset $NOVA_CPU_CONF vendordata_dynamic_auth project_id $admin_project
-    iniset $NOVA_CPU_CONF vendordata_dynamic_auth user_domain_name default
+    iniset $NOVA_CONF api vendordata_providers StaticJSON,DynamicJSON
+    iniset $NOVA_CONF api vendordata_jsonfile_path $NOVA_CONF_DIR/tatu_static_vd.json
+    iniset $NOVA_CONF api vendordata_dynamic_targets tatu@$TATU_SERVICE_PROTOCOL://$TATU_SERVICE_HOST:$TATU_SERVICE_PORT/novavendordata
+    iniset $NOVA_CONF api vendordata_dynamic_connect_timeout 5
+    iniset $NOVA_CONF api vendordata_dynamic_read_timeout 30
+    iniset $NOVA_CONF vendordata_dynamic_auth auth_url $KEYSTONE_SERVICE_URI
+    iniset $NOVA_CONF vendordata_dynamic_auth auth_type password
+    iniset $NOVA_CONF vendordata_dynamic_auth username admin
+    iniset $NOVA_CONF vendordata_dynamic_auth password $ADMIN_PASSWORD
+    iniset $NOVA_CONF vendordata_dynamic_auth project_id $admin_project
+    iniset $NOVA_CONF vendordata_dynamic_auth user_domain_name default
 
     # General Configuration
     iniset_rpc_backend tatu $TATU_CONF DEFAULT