starlingx
/
config
Code Issues Proposed changes

Merge "Fix configutilities and controllerconfig installs in DevStack"

This commit is contained in:
Zuul 2019-02-19 16:35:20 +00:00 committed by Gerrit Code Review
parent 0dd4b86526 cf23446094
commit 2b3925e662
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.zuul.yaml
View File

@ -180,7 +180,8 @@
# fm-rest-api: true # fm-rest-api: true
# fm-mgr: true # fm-mgr: true
sysinv-agent: true sysinv-agent: true
sysinv-api: true # Skip sysinv-api for now, needs more attention
# sysinv-api: true
sysinv-cond: true sysinv-cond: true
mysql: false mysql: false
postgresql: true postgresql: true

14
devstack/lib/stx-config
View File

@ -162,15 +162,17 @@ function install_cgtsclient {
} }
function install_configutilities { function install_configutilities {
pushd $STXCONFIG_CONFUTILS # We can't use setup_develop as there is no setup.cfg file present for configutilities
sudo python setup.py install --root=/ --install-lib=$PYTHON_SITE_DIR --prefix=/usr --install-data=/usr/share --single-version-externally-managed setup_package $STXCONFIG_CONFUTILS -e
popd
} }
function install_controllerconfig { function install_controllerconfig {
pushd $STXCONFIG_CONTROL # This is a hack to work around the lack of proper global-requirements
sudo python setup.py install --root=/ --install-lib=$PYTHON_SITE_DIR --prefix=/usr --install-data=/usr/share --single-version-externally-managed # setup in these packages
popd pip_install pycrypto
# We can't use setup_develop as there is no setup.cfg file present for controllerconfig
setup_package $STXCONFIG_CONTROL -e
} }
function install_sysinv { function install_sysinv {

9
devstack/settings
View File

@ -7,8 +7,13 @@
STX_CONFIG_NAME=stx-config STX_CONFIG_NAME=stx-config
######### Plugin Specific ########## ######### Plugin Specific ##########
enable_service $STX_CONFIG_NAME sysinv sysinv-api sysinv-cond enable_service $STX_CONFIG_NAME
#define_plugin sysinv
# This must not use any variables to work properly in OpenStack's DevStack playbook
define_plugin stx-config
# This works for Zuul jobs using OpenStack's DevStack roles
plugin_requires stx-config stx-integ
plugin_requires stx-config stx-update
# Handle STX pre-reqs # Handle STX pre-reqs
# stx-integ # stx-integ