From cf23446094d52851e4bd2ade516ab724b65844f0 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Tue, 12 Feb 2019 17:06:53 -0600
Subject: [PATCH] Fix configutilities and controllerconfig installs in DevStack

Use the DevStack-provided functions to do the Python installations
for configutilities and controllerconfig.

Prepare the plugin setting for declaring DevStack prereqs that
is available in master's DevStack playbook.

Also do not enable all services by default. sysinv-api is disabled
in the devstack job as it does not properly start under Bionic.  We
will address this separately.

Change-Id: Ib57863526d285049b5964828e1b60bf215d25a23
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
---
 .zuul.yaml              |  3 ++-
 devstack/lib/stx-config | 14 ++++++++------
 devstack/settings       |  9 +++++++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 2d02a9db55..c17ef2659e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -180,7 +180,8 @@
         # fm-rest-api: true
         # fm-mgr: true
         sysinv-agent: true
-        sysinv-api: true
+        # Skip sysinv-api for now, needs more attention
+        # sysinv-api: true
         sysinv-cond: true
         mysql: false
         postgresql: true
diff --git a/devstack/lib/stx-config b/devstack/lib/stx-config
index e8d261913a..9bb9854ca8 100644
--- a/devstack/lib/stx-config
+++ b/devstack/lib/stx-config
@@ -162,15 +162,17 @@ function install_cgtsclient {
 }
 
 function install_configutilities {
-    pushd $STXCONFIG_CONFUTILS
-    sudo python setup.py install --root=/ --install-lib=$PYTHON_SITE_DIR --prefix=/usr --install-data=/usr/share --single-version-externally-managed
-    popd
+    # We can't use setup_develop as there is no setup.cfg file present for configutilities
+    setup_package $STXCONFIG_CONFUTILS -e
 }
 
 function install_controllerconfig {
-    pushd $STXCONFIG_CONTROL
-    sudo python setup.py install --root=/ --install-lib=$PYTHON_SITE_DIR --prefix=/usr --install-data=/usr/share --single-version-externally-managed
-    popd
+    # This is a hack to work around the lack of proper global-requirements
+    # setup in these packages
+    pip_install pycrypto
+
+    # We can't use setup_develop as there is no setup.cfg file present for controllerconfig
+    setup_package $STXCONFIG_CONTROL -e
 }
 
 function install_sysinv {
diff --git a/devstack/settings b/devstack/settings
index 74795743ff..87cfd07319 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -7,8 +7,13 @@
 STX_CONFIG_NAME=stx-config
 
 ######### Plugin Specific ##########
-enable_service $STX_CONFIG_NAME sysinv sysinv-api sysinv-cond
-#define_plugin sysinv
+enable_service $STX_CONFIG_NAME
+
+# This must not use any variables to work properly in OpenStack's DevStack playbook
+define_plugin stx-config
+# This works for Zuul jobs using OpenStack's DevStack roles
+plugin_requires stx-config stx-integ
+plugin_requires stx-config stx-update
 
 # Handle STX pre-reqs
 # stx-integ