openstack/ironic
Code Issues Proposed changes

Merge "Ignore required_services for multinode topology"

Browse Source
This commit is contained in:
Jenkins 2016-11-04 12:51:22 +00:00 committed by Gerrit Code Review
commit f1b57087d5
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
devstack/lib/ironic
View File

@ -428,16 +428,19 @@ function setup_virtualbmc {
# install_ironic() - Install the things!
function install_ironic {
# make sure all needed service were enabled
local req_services="key"
if [[ "$VIRT_DRIVER" == "ironic" ]]; then
req_services+=" nova glance neutron"
fi
for srv in $req_services; do
if ! is_service_enabled "$srv"; then
die $LINENO "$srv should be enabled for Ironic."
# NOTE(vsaienko) do not check required_services on subnode
if [[ "$HOST_TOPOLOGY_ROLE" != "subnode" ]]; then
# make sure all needed service were enabled
local req_services="key"
if [[ "$VIRT_DRIVER" == "ironic" ]]; then
req_services+=" nova glance neutron"
fi
done
for srv in $req_services; do
if ! is_service_enabled "$srv"; then
die $LINENO "$srv should be enabled for Ironic."
fi
done
fi
if use_library_from_git "ironic-lib"; then
git_clone_by_name "ironic-lib"