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
Depends-On: https://review.opendev.org/654255
Change-Id: I10df1d0ba5fdb571ae713fe1fdd3cfa13c4875bf
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
changes/56/654256/2
Dean Troyer 3 years ago
parent
commit
1c20c0264e
  1. 12
      .zuul.yaml
  2. 6
      README.rst
  3. 4
      devstack/lib/nfv
  4. 2
      devstack/plugin.sh
  5. 20
      devstack/settings
  6. 6
      nfv/tox.ini

12
.zuul.yaml

@ -115,9 +115,9 @@
nfv-client: true
devstack_plugins:
barbican: https://opendev.org/openstack/barbican
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-metal: https://git.starlingx.io/stx-metal
stx-nfv: https://git.starlingx.io/stx-nfv
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
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-nfv
=======
===
nfv
===
StarlingX NFVI Orchestration

4
devstack/lib/stx-nfv → devstack/lib/nfv

@ -7,7 +7,7 @@
# Copyright (c) 2019 Wind River Systems, Inc.
#
# lib/stx-nfv
# lib/nfv
_XTRACE_STX_NFV=$(set +o | grep xtrace)
set -o xtrace
@ -146,7 +146,7 @@ function configure_guest_server {
}
function configure_mtce_guest_common {
# the content related to "controller" in /etc/hosts is generated by stx-metal
# the content related to "controller" in /etc/hosts is generated by metal
# devstack plugin. for the time being, there are no entries about oamcontroller,
# pxecontroller, ipv6, etc. so here we use a simple regular expression.
if grep -q "^[0-9]\{1,3\}.*\s\+controller$" /etc/hosts; then

2
devstack/plugin.sh

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

20
devstack/settings

@ -9,7 +9,7 @@
# Devstack settings
# This plugin enables StarlingX stx-update services and follows the
# This plugin enables StarlingX nfv services and follows the
# DevStack plugin contract:
# https://docs.openstack.org/devstack/latest/plugins.html#plugin-sh-contract
@ -18,19 +18,19 @@
# Defaults
# --------
STX_NFV_NAME=stx-nfv
STX_NFV_NAME=nfv
######### Plugin Specific ##########
enable_service $STX_NFV_NAME
# This must not use any variables to work properly in OpenStack's DevStack playbook
define_plugin stx-nfv
define_plugin nfv
# This works for Zuul jobs using OpenStack's DevStack roles
plugin_requires stx-nfv stx-update
plugin_requires stx-nfv stx-fault
plugin_requires stx-nfv stx-metal
plugin_requires nfv update
plugin_requires nfv fault
plugin_requires nfv metal
if is_service_enabled stx-nfv; then
if is_service_enabled nfv; then
# Enable prerequisites here
:
fi
@ -40,9 +40,9 @@ fi
# prereqs are not configured?
if is_service_enabled guest-agent || is_service_enabled guest-server; then
# These guest- services require additional prerequisites
# stx-metal: to install mtce_common header files and libraries
# metal: to install mtce_common header files and libraries
# fm-common: to install fmcommon library
local req_services="stx-metal fm-common"
local req_services="metal fm-common"
for srv in $req_services;do
if ! is_service_enabled "$srv"; then
die $LINENO "$srv should be enabled for guestAgent/guestServer"
@ -51,4 +51,4 @@ if is_service_enabled guest-agent || is_service_enabled guest-server; then
fi
# Initial source of lib script
source $DEST/stx-nfv/devstack/lib/stx-nfv
source $DEST/nfv/devstack/lib/nfv

6
nfv/tox.ini

@ -16,7 +16,7 @@ stxdir = {toxinidir}/../..
[testenv]
recreate = True
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}
whitelist_externals = cp
[nfv]
@ -26,7 +26,7 @@ nfv_common_dir = ./nfv-common
nfv_plugins_dir = ./nfv-plugins
nfv_vim_dir = ./nfv-vim
nfv_test_dir = ./nfv-tests
stx_fault_dir = ../../stx-fault
stx_fault_dir = ../../fault
nfv_client_src_dir = {[nfv]nfv_client_dir}/nfv_client
nfv_common_src_dir = {[nfv]nfv_common_dir}/nfv_common
@ -105,7 +105,7 @@ commands = pylint {[nfv]nfv_client_src_dir} \
--rcfile=./pylint.rc
[bandit]
# These are the bandit codes that are failing for stx-nfv
# These are the bandit codes that are failing for nfv
# B104: hardcoded_bind_all_interfaces
# B108: Probable insecure usage of temp file/directory
# B110: Try, Except, Pass detected.

Loading…
Cancel
Save