starlingx/ha
Code Issues Proposed changes

Followup opendev cleanup and test jobs

Browse Source 
Depends-On: https://review.opendev.org/653964
Depends-On: https://review.opendev.org/653961
Depends-On: https://review.opendev.org/654013
Depends-On: https://review.opendev.org/654024
Depends-On: https://review.opendev.org/654255
Depends-On: https://review.opendev.org/654256
Change-Id: Ie110350e44b0dd333f3b3969773e4ef21674381c
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
Dean Troyer 2019-04-21 14:31:29 -05:00
parent d6620b86b2
commit 08bff2798f
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.zuul.yaml
View File

@ -53,10 +53,10 @@
tls-proxy: false tls-proxy: false
devstack_plugins: devstack_plugins:
barbican: https://opendev.org/openstack/barbican barbican: https://opendev.org/openstack/barbican
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-ha: https://git.starlingx.io/stx-ha ha: https://opendev.org/starlingx/ha
stx-integ: https://git.starlingx.io/stx-integ integ: https://opendev.org/starlingx/integ
stx-metal: https://git.starlingx.io/stx-metal metal: https://opendev.org/starlingx/metal
stx-nfv: https://git.starlingx.io/stx-nfv nfv: https://opendev.org/starlingx/nfv
stx-update: https://git.starlingx.io/stx-update update: https://opendev.org/starlingx/update

6
README.rst
View File

@ -1,5 +1,5 @@
====== ====
stx-ha ha
====== ====
StarlingX Service Management StarlingX Service Management

2
devstack/build.sh
View File

@ -29,7 +29,7 @@ function is_service_enabled {
} }
# Get the build functions # Get the build functions
source $PLUGIN_DIR/devstack/lib/stx-ha source $PLUGIN_DIR/devstack/lib/ha
# Call builds # Call builds
build_sm_common build_sm_common

0
devstack/files/debs/stx-ha → devstack/files/debs/ha
View File

4
devstack/lib/stx-ha → devstack/lib/ha
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# lib/stx-config # lib/ha
# Functions to control the configuration and operation of stx-ha # Functions to control the configuration and operation of ha
# ``plugin.sh`` calls the following entry points: # ``plugin.sh`` calls the following entry points:
# #

2
devstack/plugin.sh
View File

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

10
devstack/settings
View File

@ -12,16 +12,16 @@
# Defaults # Defaults
# -------- # --------
STX_HA_NAME=stx-ha STX_HA_NAME=ha
######### Plugin Specific ########## ######### Plugin Specific ##########
enable_service $STX_HA_NAME enable_service $STX_HA_NAME
# This must not use any variables to work properly in the devstack playbook # This must not use any variables to work properly in the devstack playbook
define_plugin stx-ha define_plugin ha
# This works for Zuul jobs using OpenStack's DevStack roles # This works for Zuul jobs using OpenStack's DevStack roles
plugin_requires stx-ha stx-metal plugin_requires ha metal
plugin_requires stx-ha stx-config plugin_requires ha config
# Initial source of lib script # Initial source of lib script
source $DEST/stx-ha/devstack/lib/stx-ha source $DEST/ha/devstack/lib/ha

2
tox.ini
View File

@ -4,7 +4,7 @@ minversion = 2.3
skipsdist = True skipsdist = True
[testenv] [testenv]
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt} {opts} {packages}
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
OS_STDOUT_CAPTURE=1 OS_STDOUT_CAPTURE=1
OS_STDERR_CAPTURE=1 OS_STDERR_CAPTURE=1