Browse Source

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>
changes/55/654255/5
Dean Troyer 3 years ago
parent
commit
c84ce08dc7
  1. 10
      .zuul.yaml
  2. 6
      README.rst
  3. 0
      devstack/files/debs/metal
  4. 0
      devstack/files/rpms/metal
  5. 4
      devstack/lib/metal
  6. 2
      devstack/plugin.sh
  7. 18
      devstack/settings
  8. 2
      tox.ini

10
.zuul.yaml

@ -55,8 +55,8 @@
rmon: true
devstack_plugins:
barbican: https://opendev.org/openstack/barbican
stx-fault: https:://git.starlingx.io/stx-fault
stx-integ: https://git.starlingx.io/stx-integ
stx-metal: https:://git.starlingx.io/stx-metal
stx-nfv: https:://git.starlingx.io/stx-nfv
stx-update: https:://git.starlingx.io/stx-update
fault: https:://opendev.org/starlingx/fault
integ: https://opendev.org/starlingx/integ
metal: https:://opendev.org/starlingx/metal
# nfv: https:://opendev.org/starlingx/nfv
update: https:://opendev.org/starlingx/update

6
README.rst

@ -1,5 +1,5 @@
=========
stx-metal
=========
=====
metal
=====
StarlingX Bare Metal Management

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

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

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

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

2
devstack/plugin.sh

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

18
devstack/settings

@ -7,7 +7,7 @@
# 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:
# https://docs.openstack.org/devstack/latest/plugins.html#plugin-sh-contract
#
@ -19,7 +19,7 @@
# Current configuration supports All-in-One simplex mode.
#
# Servcies
# stx-metal - Overall enable for this plugin
# metal - Overall enable for this plugin
#
# mtce
# mtce-control
@ -34,17 +34,17 @@
# mtclog
# pmon
STX_METAL_NAME=stx-metal
STX_METAL_NAME=metal
######### Plugin Specific ##########
# Enable service for node type
enable_service $STX_METAL_NAME
# 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
plugin_requires stx-metal barbican
plugin_requires stx-metal stx-fault
plugin_requires metal barbican
plugin_requires metal fault
if ! is_service_enabled barbican; then
die $LINENO "Barbican is required"
@ -59,7 +59,7 @@ fi
#enable_service hostw
if is_service_enabled mtce-compute; then
# stx-update
# update
enable_service tsconfig
fi
# 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 mtcClient
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
fi
@ -86,4 +86,4 @@ if is_service_enabled mtcAgent; then
fi
# Initial source of lib script
source $DEST/stx-metal/devstack/lib/stx-metal
source $DEST/metal/devstack/lib/metal

2
tox.ini

@ -4,7 +4,7 @@ minversion = 2.3
skipsdist = True
[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}
OS_STDOUT_CAPTURE=1
OS_STDERR_CAPTURE=1

Loading…
Cancel
Save