commit d2ab3cef4eb05e5811d39d740274fdbdd1027a5b
Author: Erik Olof Gunnar Andersson <email address hidden>
Date: Mon Apr 22 21:12:07 2019 -0700
Pass on region when we don't have a valid ironic endpoint
If for some reason we don't have a valid endpoint to provide the
Ironic client, we should at the very least provide the information
it needs to make an informed decision.
Conflicts:
nova/tests/unit/virt/ironic/test_client_wrapper.py
The conflict here is twofold:
- Each release has a different value for the latest/previous
os_ironic_api_version kwarg. This fix doesn't change that value, so it
needs to be "left alone" in the tests.
- The 'ironic_url' kwarg was renamed to 'endpoint' in the stein release
[1]; it needs to be left as 'ironic_url' in rocky and prior.
[1] I1b3ce1955622c40b780c0b15ec7e09be3e8ace72
Change-Id: I31fa1c6fb0b224fbb02f9ebf68abc6a3728e9389
Partial-Bug: #1825583
(cherry picked from commit 6eaa6db0ee01ee5a7b56bc3176914d85e697b96a)
(cherry picked from commit 222f462444b72368cd5f22d4b0ac9baf0bbe8e0c)
Reviewed: https:/ /review. opendev. org/656525 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=d2ab3cef4eb 05e5811d39d7402 74fdbdd1027a5b
Committed: https:/
Submitter: Zuul
Branch: stable/rocky
commit d2ab3cef4eb05e5 811d39d740274fd bdd1027a5b
Author: Erik Olof Gunnar Andersson <email address hidden>
Date: Mon Apr 22 21:12:07 2019 -0700
Pass on region when we don't have a valid ironic endpoint
If for some reason we don't have a valid endpoint to provide the
Ironic client, we should at the very least provide the information
it needs to make an informed decision.
Conflicts: tests/unit/ virt/ironic/ test_client_ wrapper. py ironic_ api_version kwarg. This fix doesn't change that value, so it
nova/
The conflict here is twofold:
- Each release has a different value for the latest/previous
os_
needs to be "left alone" in the tests.
- The 'ironic_url' kwarg was renamed to 'endpoint' in the stein release
[1]; it needs to be left as 'ironic_url' in rocky and prior.
[1] I1b3ce1955622c4 0b780c0b15ec7e0 9be3e8ace72
Change-Id: I31fa1c6fb0b224 fbb02f9ebf68abc 6a3728e9389 a7b56bc3176914d 85e697b96a) 8cd5f22d4b0ac9b af0bbe8e0c)
Partial-Bug: #1825583
(cherry picked from commit 6eaa6db0ee01ee5
(cherry picked from commit 222f462444b7236