openstack/ironic
Code Issues Proposed changes

Merge "DevStack: Install gunicorn and sushy based on g-r constraints"

Browse Source
This commit is contained in:
Jenkins 2017-05-07 18:18:02 +00:00 committed by Gerrit Code Review
commit a68e30a4f3
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/lib/ironic
View File

@ -571,7 +571,7 @@ IRONIC_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-$IRONIC_DEFAULT_IMAGE_NAME}
# the redfish driver # the redfish driver
if is_deployed_by_redfish && [[ "$IRONIC_ENABLED_HARDWARE_TYPES" != *"redfish"* ]]; then if is_deployed_by_redfish && [[ "$IRONIC_ENABLED_HARDWARE_TYPES" != *"redfish"* ]]; then
die $LINENO "Please make sure that the redfish hardware" \ die $LINENO "Please make sure that the redfish hardware" \
"type, is enabled. Take a look at the " \ "type is enabled. Take a look at the " \
"IRONIC_ENABLED_HARDWARE_TYPES configuration option" \ "IRONIC_ENABLED_HARDWARE_TYPES configuration option" \
"for DevStack" "for DevStack"
fi fi
@ -691,7 +691,7 @@ function start_redfish_emulator {
if is_ubuntu; then if is_ubuntu; then
install_package gunicorn install_package gunicorn
else else
pip_install "gunicorn" pip_install_gr "gunicorn"
fi fi
sudo gunicorn sushy_tools.emulator.main:app --bind "${HOST_IP}:${IRONIC_REDFISH_EMULATOR_PORT}" \ sudo gunicorn sushy_tools.emulator.main:app --bind "${HOST_IP}:${IRONIC_REDFISH_EMULATOR_PORT}" \
@ -709,9 +709,7 @@ function setup_redfish {
git_clone_by_name "sushy" git_clone_by_name "sushy"
setup_dev_lib "sushy" setup_dev_lib "sushy"
else else
# TODO(lucasagomes): use pip_install_gr once sushy is added to pip_install_gr "sushy"
# the global requirements
pip_install "sushy"
fi fi
pip_install "sushy-tools" pip_install "sushy-tools"