starlingx/nfv
Code Issues Proposed changes

Add stx-update to devstack plugin dependency list

Browse Source 
Add the minimum dependency bits for devstack master, plus the
required stx-update plugin in the devstack job definition.

The remaining master/bionic stuff will be in a follow-up review.

Change-Id: Id6b4e3dad1fe54d66b2b5a3dbbe3983621943bb2
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
Dean Troyer 2019-02-20 14:58:48 -06:00
parent 9f74687dc0
commit f7a3cfb7ce
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -94,6 +94,7 @@
timeout: 7800 timeout: 7800
required-projects: required-projects:
- openstack/stx-fault - openstack/stx-fault
- openstack/stx-update
vars: vars:
tox_envlist: functional tox_envlist: functional
devstack_services: devstack_services:
@ -132,5 +133,6 @@
devstack_plugins: devstack_plugins:
stx-fault: git://git.starlingx.io/stx-fault stx-fault: git://git.starlingx.io/stx-fault
stx-nfv: git://git.starlingx.io/stx-nfv stx-nfv: git://git.starlingx.io/stx-nfv
stx-update: git://git.starlingx.io/stx-update
devstack_localrc: devstack_localrc:
LIBS_FROM_GIT: keystone LIBS_FROM_GIT: keystone

11
devstack/settings
View File

@ -1,6 +1,12 @@
#!/bin/bash #!/bin/bash
# Devstack settings # Devstack settings
# This plugin enables StarlingX stx-update services and follows the
# DevStack plugin contract:
# https://docs.openstack.org/devstack/latest/plugins.html#plugin-sh-contract
# Services
# Defaults # Defaults
# -------- # --------
@ -9,6 +15,11 @@ STX_NFV_NAME=stx-nfv
######### Plugin Specific ########## ######### Plugin Specific ##########
enable_service $STX_NFV_NAME enable_service $STX_NFV_NAME
# This must not use any variables to work properly in OpenStack's DevStack playbook
define_plugin stx-nfv
# This works for Zuul jobs using OpenStack's DevStack roles
plugin_requires stx-nfv stx-update
if is_service_enabled stx-nfv; then if is_service_enabled stx-nfv; then
# Enable prerequisites here # Enable prerequisites here
: :