starlingx
/
metal
Code Issues Proposed changes

Followup opendev cleanup and test jobs 

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
Change-Id: Id3f05219865a595a2a9f36e83a4ad6bbfd0e16fc
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
Dean Troyer 2019-04-21 11:30:25 -05:00
parent 2a05b8c09a
commit c84ce08dc7
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.zuul.yaml
View File

@ -55,8 +55,8 @@
rmon: true rmon: true
devstack_plugins: devstack_plugins:
barbican: https://opendev.org/openstack/barbican barbican: https://opendev.org/openstack/barbican
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-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-metal metal
========= =====
StarlingX Bare Metal Management StarlingX Bare Metal Management

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

0
devstack/files/rpms/stx-metal → devstack/files/rpms/metal
View File

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

@ -4,8 +4,8 @@
# #
# Copyright (C) 2019 Intel Corporation # Copyright (C) 2019 Intel Corporation
# #
# lib/stx-metal # lib/metal
# Functions to control the configuration and operation of stx-metal # Functions to control the configuration and operation of metal
# #
# To add a new maintenance service, the following functions should be # To add a new maintenance service, the following functions should be
# added/modified. # added/modified.

2
devstack/plugin.sh
View File

@ -11,7 +11,7 @@
echo_summary "Metal devstack plugin.sh called: $1/$2" echo_summary "Metal devstack plugin.sh called: $1/$2"
# check for service enabled # check for service enabled
if is_service_enabled stx-metal; then if is_service_enabled metal; then
if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
# Pre-install requirties # Pre-install requirties
echo_summary "Pre-requires of stx-metal" echo_summary "Pre-requires of stx-metal"

18
devstack/settings
View File

@ -7,7 +7,7 @@
# Devstack settings # Devstack settings
# This plugin is to enable StarlingX stx-metal services and follows the # This plugin is to enable StarlingX metal services and follows the
# devstack plugin contract: # devstack plugin contract:
# https://docs.openstack.org/devstack/latest/plugins.html#plugin-sh-contract # https://docs.openstack.org/devstack/latest/plugins.html#plugin-sh-contract
# #
@ -19,7 +19,7 @@
# Current configuration supports All-in-One simplex mode. # Current configuration supports All-in-One simplex mode.
# #
# Servcies # Servcies
# stx-metal - Overall enable for this plugin # metal - Overall enable for this plugin
# #
# mtce # mtce
# mtce-control # mtce-control
@ -34,17 +34,17 @@
# mtclog # mtclog
# pmon # pmon
STX_METAL_NAME=stx-metal STX_METAL_NAME=metal
######### Plugin Specific ########## ######### Plugin Specific ##########
# Enable service for node type # Enable service for node type
enable_service $STX_METAL_NAME enable_service $STX_METAL_NAME
# This must not use any variables to work properly in OpenStack's DevStack playbook # This must not use any variables to work properly in OpenStack's DevStack playbook
define_plugin stx-metal define_plugin metal
# This works for Zuul jobs using OpenStack's DevStack roles # This works for Zuul jobs using OpenStack's DevStack roles
plugin_requires stx-metal barbican plugin_requires metal barbican
plugin_requires stx-metal stx-fault plugin_requires metal fault
if ! is_service_enabled barbican; then if ! is_service_enabled barbican; then
die $LINENO "Barbican is required" die $LINENO "Barbican is required"
@ -59,7 +59,7 @@ fi
#enable_service hostw #enable_service hostw
if is_service_enabled mtce-compute; then if is_service_enabled mtce-compute; then
# stx-update # update
enable_service tsconfig enable_service tsconfig
fi fi
# run_process checks whether the service name is enabled or not # run_process checks whether the service name is enabled or not
@ -73,7 +73,7 @@ if is_service_enabled mtce; then
enable_service mtcAgent enable_service mtcAgent
enable_service mtcClient enable_service mtcClient
fi fi
if is_service_enabled hwmon && is_plugin_enabled stx-config; then if is_service_enabled hwmon && is_plugin_enabled config; then
enable_service sysinv enable_service sysinv
fi fi
@ -86,4 +86,4 @@ if is_service_enabled mtcAgent; then
fi fi
# Initial source of lib script # Initial source of lib script
source $DEST/stx-metal/devstack/lib/stx-metal source $DEST/metal/devstack/lib/metal

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