diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-07 18:18:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-07 18:18:02 +0000 |
| commit | a68e30a4f3b8d171ddec4304f09f8c707350bb99 (patch) | |
| tree | 3c4f2c666ce4a16a7e92bc2fc6de35ac9a87535a /devstack | |
| parent | bb9a6e7a33dbe624a84eb7b25c9b8f53249e5189 (diff) | |
| parent | c8e3679ace7d14e0039b45b7124597ce18d1dd4e (diff) | |
| download | ironic-a68e30a4f3b8d171ddec4304f09f8c707350bb99.tar.gz | |
Merge "DevStack: Install gunicorn and sushy based on g-r constraints"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 8f79030e6..5c80a8d2e 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -571,7 +571,7 @@ IRONIC_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-$IRONIC_DEFAULT_IMAGE_NAME} # the redfish driver if is_deployed_by_redfish && [[ "$IRONIC_ENABLED_HARDWARE_TYPES" != *"redfish"* ]]; then 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" \ "for DevStack" fi @@ -691,7 +691,7 @@ function start_redfish_emulator { if is_ubuntu; then install_package gunicorn else - pip_install "gunicorn" + pip_install_gr "gunicorn" fi 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" setup_dev_lib "sushy" else - # TODO(lucasagomes): use pip_install_gr once sushy is added to - # the global requirements - pip_install "sushy" + pip_install_gr "sushy" fi pip_install "sushy-tools" |