From b217f4c87c0bda28f1b4405fbde154130340053e Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 8 Feb 2019 15:36:59 -0600
Subject: [PATCH] Convert DevStack jobs to master & bionic

We're changing to upstream master soon, let's start running
on the upstream devstack configuration.

There is an undeclared dependency on cgtsclient in fm-rest-api
so we need to work around that.

Change-Id: If764701fce94fb760edf0a68805753d3804892c0
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
---
 .zuul.yaml             | 20 +++++++-------------
 devstack/lib/stx-fault |  6 +++---
 devstack/settings      |  7 +++++++
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 91d6068f..a94604b8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -39,7 +39,7 @@
 # This job is to begin testing a DevStack run here
 - job:
     name: stx-devstack-base
-    nodeset: openstack-single-node-xenial
+    nodeset: openstack-single-node-bionic
     parent: devstack
     description: |
       Base job for StarlingX DevStack tests
@@ -48,19 +48,12 @@
     timeout: 9000
     required-projects:
       - name: git.openstack.org/openstack-dev/devstack
-        override-branch: stable/pike
-      - name: git.openstack.org/openstack/cinder
-        override-branch: stable/pike
-      - name: git.openstack.org/openstack/glance
-        override-branch: stable/pike
+#      - name: git.openstack.org/openstack/cinder
+#      - name: git.openstack.org/openstack/glance
       - name: git.openstack.org/openstack/keystone
-        override-branch: stable/pike
-      - name: git.openstack.org/openstack/neutron
-        override-branch: stable/pike
-      - name: git.openstack.org/openstack/nova
-        override-branch: stable/pike
+#      - name: git.openstack.org/openstack/neutron
+#      - name: git.openstack.org/openstack/nova
       - name: git.openstack.org/openstack/requirements
-        override-branch: stable/pike
     vars:
       devstack_services:
         ceilometer-acentral: false
@@ -81,7 +74,8 @@
         mysql: false
         postgresql: true
       devstack_localrc:
-        LIBS_FROM_GIT: cinder,glance,keystone,neutron,nova
+        # LIBS_FROM_GIT: cinder,glance,keystone,neutron,nova
+        LIBS_FROM_GIT: keystone
         FORCE: yes
 
 - job:
diff --git a/devstack/lib/stx-fault b/devstack/lib/stx-fault
index 57dcb248..2a04343a 100644
--- a/devstack/lib/stx-fault
+++ b/devstack/lib/stx-fault
@@ -238,7 +238,7 @@ function install_fault {
     if is_service_enabled fm-mgr; then
         install_fm_mgr
     fi
-    if is_service_enabled fm-rest-api; then
+    if is_service_enabled fm-rest-api && is_service_enabled stx-config; then
         install_fm_rest_api
     fi
 }
@@ -341,13 +341,13 @@ function install_fm_rest_api {
 }
 
 function start_fault {
-    if is_service_enabled fm-api; then
+    if is_service_enabled fm-rest-api; then
         run_process fm-api "$STX_BIN_DIR/fm-api --config-file $FM_RESTAPI_CONF"
     fi
 }
 
 function stop_fault {
-    if is_service_enabled fm-api; then
+    if is_service_enabled fm-rest-api; then
         stop_process fm_api
     fi
 }
diff --git a/devstack/settings b/devstack/settings
index 643b5501..a081308f 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -17,6 +17,13 @@ STX_FAULT_NAME=stx-fault
 ######### Plugin Specific ##########
 enable_service $STX_FAULT_NAME
 
+# Circular dependencies are fun!
+# fm-rest-api has an undeclared dependency on cgtsclient from stx-config
+# so if that is not present we can't install it
+if ! is_service_enabled stx-config; then
+    disable_service fm-rest-api
+fi
+# but fm-rest-api has its own (declared!) external dependencies too
 if is_service_enabled fm-rest-api; then
     enable_service tsconfig
 fi