From cd5693bc48fe946ef2c2ea7ad51f1a10b5e2f7fe Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Sat, 20 Apr 2019 11:06:46 -0500 Subject: [PATCH] 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 --- .zuul.yaml | 12 ++++++------ README.rst | 6 +++--- devstack/build.sh | 2 +- devstack/lib/{stx-fault => fault} | 10 +++++----- devstack/plugin.sh | 2 +- devstack/settings | 16 ++++++++-------- 6 files changed, 24 insertions(+), 24 deletions(-) rename devstack/lib/{stx-fault => fault} (97%) diff --git a/.zuul.yaml b/.zuul.yaml index 49bb0506..ae37045b 100644 --- a/.zuul.yaml +++ b/.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 - stx-fault: https://git.starlingx.io/stx-fault - stx-integ: https://git.starlingx.io/stx-integ - stx-update: https://git.starlingx.io/stx-update + # config: https://opendev.org/starlingx/config + fault: https://opendev.org/starlingx/fault + integ: https://opendev.org/starlingx/integ + update: https://opendev.org/starlingx/update diff --git a/README.rst b/README.rst index 13efe1ce..ea09912c 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -========= -stx-fault -========= +===== +fault +===== StarlingX Fault Management diff --git a/devstack/build.sh b/devstack/build.sh index f5b2a697..769d5cb1 100755 --- a/devstack/build.sh +++ b/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 diff --git a/devstack/lib/stx-fault b/devstack/lib/fault similarity index 97% rename from devstack/lib/stx-fault rename to devstack/lib/fault index 8f9eab2a..9a8d489d 100644 --- a/devstack/lib/stx-fault +++ b/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 } diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 3e840014..ba500441 100755 --- a/devstack/plugin.sh +++ b/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" diff --git a/devstack/settings b/devstack/settings index fe0283a2..8948bca2 100644 --- a/devstack/settings +++ b/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