diff options
| author | Zuul <zuul@review.opendev.org> | 2019-08-09 15:42:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-08-09 15:42:20 +0000 |
| commit | 16888246729c2e8a2fdd5111c426e77e0ada868c (patch) | |
| tree | 734493d04b5fe4637593b3ec0c143040ed462b6a | |
| parent | 049c435e7995050acd4e0ec3ee061855ffe0650c (diff) | |
| parent | 4014612ca0f027e4d86a0999887f949a55a89a83 (diff) | |
| download | ironic-16888246729c2e8a2fdd5111c426e77e0ada868c.tar.gz | |
Merge "Enable testing adoption in the CI" into stable/stein
| -rw-r--r-- | devstack/lib/ironic | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 88cc4a072..0723dddce 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -2604,7 +2604,11 @@ function ironic_configure_tempest { # Enabled features iniset $TEMPEST_CONFIG baremetal_feature_enabled ipxe_enabled $IRONIC_IPXE_ENABLED iniset $TEMPEST_CONFIG baremetal_feature_enabled fast_track_discovery $IRONIC_DEPLOY_FAST_TRACK - + if [[ "$IRONIC_IS_HARDWARE" == "False" ]]; then + # Adoption requires reading or guessing the BMC credentials, so let's + # not enable it for real hardware, at least for now. + iniset $TEMPEST_CONFIG baremetal_feature_enabled adoption True + fi } function get_ironic_node_prefix { |