Followup opendev cleanup and test jobs

Because we are in a deadly embrace with the config plugin after
the OpenDev work the config plugin is being forced off in this job
to remove one of the dependencies.

Ultimately extracting cgts-client to be installable stand-alone
is a better solution to allow other plugins to install directly.

Depends-On: https://review.opendev.org/653961
Change-Id: I47f1d0df404fc40a9d514c1b0689b5457dbc3f87
Signed-off-by: Dean Troyer <dtroyer@gmail.com>

.zuul.yaml

@@ -40,19 +40,19 @@
     name: flock-devstack-fault
     parent: flock-devstack-base-min
     required-projects:
-      - name: starlingx/config
+      # - name: starlingx/config
       - name: starlingx/integ
       - name: starlingx/update
     vars:
       tox_envlist: functional
       devstack_services:
-        cgtsclient: true
+        # cgtsclient: true
         fm-common: true
         fm-api: true
         fm-rest-api: true
         fm-mgr: true
       devstack_plugins:
-        stx-config: https://git.starlingx.io/stx-config
+        # config: https://opendev.org/starlingx/config
-        stx-fault: https://git.starlingx.io/stx-fault
+        fault: https://opendev.org/starlingx/fault
-        stx-integ: https://git.starlingx.io/stx-integ
+        integ: https://opendev.org/starlingx/integ
-        stx-update: https://git.starlingx.io/stx-update
+        update: https://opendev.org/starlingx/update

README.rst

@@ -1,5 +1,5 @@
-=========
+=====
-stx-fault
+fault
-=========
+=====
 
 StarlingX Fault Management

devstack/build.sh

@@ -33,7 +33,7 @@ function is_service_enabled {
 }
 
 # Get the build functions
-source $PLUGIN_DIR/devstack/lib/stx-fault
+source $PLUGIN_DIR/devstack/lib/fault
 
 # Call builds
 build_fm_common

devstack/lib/fault

@@ -4,12 +4,12 @@
 #
 # Copyright (C) 2019 Intel Corporation
 #
-# lib/stx-fault
+# lib/fault
 # Functions to control the configuration and operation of the **fault** service
 
 # Dependencies:
 #
-# - The stx-update plugin must be enabled
+# - The update plugin must be enabled
 
 # ``stack.sh`` calls the entry points in this order:
 #
@@ -191,7 +191,7 @@ function cleanup_fm_rest_api {
 }
 
 function configure_fault {
-    if is_service_enabled fm-rest-api; then
+    if is_service_enabled fm-mgr || is_service_enabled fm-rest-api; then
         configure_fm_rest_api
         create_fault_user_group
         create_fault_accounts
@@ -257,7 +257,7 @@ function create_fault_user_group {
 function init_fault {
     create_fault_cache_dir
 
-    if is_service_enabled fm-rest-api && is_service_enabled stx-config; then
+    if is_service_enabled fm-rest-api && is_service_enabled config; then
         init_rest_api
     fi
 }
@@ -281,7 +281,7 @@ function install_fault {
     if is_service_enabled fm-mgr; then
         install_fm_mgr
     fi
-    if is_service_enabled fm-rest-api && is_service_enabled stx-config; then
+    if is_service_enabled fm-rest-api && is_service_enabled config; then
         install_fm_rest_api
     fi
 }

devstack/plugin.sh

@@ -11,7 +11,7 @@
 echo_summary "stx-fault devstack plugin.sh called: $1/$2"
 
 # check for service enabled
-if is_service_enabled stx-fault; then
+if is_service_enabled fault; then
     if [[ "$1" == "stack" && "$2" == "install" ]]; then
         # Perform installation of source
         echo_summary "Install stx-fault"

devstack/settings

@@ -8,7 +8,7 @@
 # Devstack settings
 
 # Services
-# stx-fault - Overall enable for this plugin
+# fault - Overall enable for this plugin
 # fm-client
 # fm-common
 # fm-api
@@ -18,27 +18,27 @@
 # Defaults
 # --------
 
-STX_FAULT_NAME=stx-fault
+STX_FAULT_NAME=fault
 
 ######### Plugin Specific ##########
 enable_service $STX_FAULT_NAME
 
 # This must not use any variables to work properly in OpenStack's DevStack playbook
-define_plugin stx-fault
+define_plugin fault
 # This works for Zuul jobs using OpenStack's DevStack roles
-plugin_requires stx-fault stx-update
+plugin_requires fault update
 
 # Circular dependencies are fun!
-# fm-rest-api has an undeclared dependency on cgtsclient from stx-config
+# fm-rest-api has an undeclared dependency on cgtsclient from config
 # so if that is not present we can't install it
-if ! is_service_enabled stx-config; then
+if ! is_service_enabled 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
-    # stx-update
+    # update
     enable_service tsconfig
 fi
 
 # Initial source of lib script
-source $DEST/stx-fault/devstack/lib/stx-fault
+source $DEST/fault/devstack/lib/fault