diff options
| -rw-r--r-- | devstack/lib/ironic | 8 | ||||
| -rw-r--r-- | devstack/plugin.sh | 3 | ||||
| -rw-r--r-- | releasenotes/source/mitaka.rst | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 60cd6f916..8325b6969 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -1020,6 +1020,14 @@ function cleanup_baremetal_basic_ops { sudo rmmod nf_nat_tftp || true } +function ironic_configure_tempest { + local bm_flavor_id + bm_flavor_id=$(openstack flavor show baremetal -f value -c id) + die_if_not_set $LINENO bm_flavor_id "Failed to get id of baremetal flavor" + iniset $TEMPEST_CONFIG compute flavor_ref $bm_flavor_id + iniset $TEMPEST_CONFIG compute flavor_ref_alt $bm_flavor_id +} + # Restore xtrace + pipefail $_XTRACE_IRONIC $_PIPEFAIL_IRONIC diff --git a/devstack/plugin.sh b/devstack/plugin.sh index de584e6d9..06f83c8a4 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -26,6 +26,9 @@ if is_service_enabled ir-api ir-cond; then echo_summary "Starting Ironic" start_ironic prepare_baremetal_basic_ops + if is_service_enabled tempest; then + ironic_configure_tempest + fi fi if [[ "$1" == "unstack" ]]; then diff --git a/releasenotes/source/mitaka.rst b/releasenotes/source/mitaka.rst index b66086b8b..2e89ca8f8 100644 --- a/releasenotes/source/mitaka.rst +++ b/releasenotes/source/mitaka.rst @@ -3,4 +3,4 @@ Mitaka Series Release Notes ============================ .. release-notes:: - :branch: origin/master + :branch: origin/stable/mitaka @@ -6,7 +6,7 @@ envlist = py34,py27,pep8 [testenv] usedevelop = True install_command = - constraints: pip install -U --force-reinstall -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} + constraints: pip install -U --force-reinstall -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/mitaka} {opts} {packages} pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} PYTHONDONTWRITEBYTECODE = 1 |