diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-01 23:01:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-01 23:01:38 +0000 |
| commit | e69152ecc7c12718d4743f30085b91745d962dd5 (patch) | |
| tree | f229518d9755655d4322662459c406e3cf7b27c3 | |
| parent | 7be5d3651d97b7254326aad9d0085e170a0f5f1a (diff) | |
| parent | 083753d0f54350f57f34c10fcc2d611eeb599317 (diff) | |
| download | ironic-e69152ecc7c12718d4743f30085b91745d962dd5.tar.gz | |
Merge "Configure tempest for multitenancy/flat network" into stable/newton
| -rw-r--r-- | devstack/lib/ironic | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 34d8edfac..8d0c0fbaf 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -1525,20 +1525,26 @@ function ironic_configure_tempest { iniset $TEMPEST_CONFIG compute flavor_ref $bm_flavor_id iniset $TEMPEST_CONFIG compute flavor_ref_alt $bm_flavor_id iniset $TEMPEST_CONFIG compute-feature-enabled disk_config False + # NOTE(jlvillal): If IRONIC_PROVISION_NETWORK_NAME is set it means that + # nodes are using the neutron network driver / multi-tenant networking. + # Otherwise we are using a flat-network. if [[ -n "${IRONIC_PROVISION_NETWORK_NAME}" ]]; then + # multi-tenant networking iniset $TEMPEST_CONFIG baremetal use_provision_network True + else + # flat-network + iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME + # NOTE(jroll) this disables multitenant network tests from tempest's + # tree, but not from our tree. This is a bit inconsistent, we should + # fix it. + iniset $TEMPEST_CONFIG auth create_isolated_networks False + iniset $TEMPEST_CONFIG network shared_physical_network True fi local image_uuid image_uuid=$(openstack image show $IRONIC_IMAGE_NAME -f value -c id) iniset $TEMPEST_CONFIG compute image_ref $image_uuid iniset $TEMPEST_CONFIG compute image_ref_alt $image_uuid - - iniset $TEMPEST_CONFIG auth create_isolated_networks False - # NOTE(jroll) this disables multitenant network tests from tempest's - # tree, but not from our tree. This is a bit inconsistent, we should - # fix it. - iniset $TEMPEST_CONFIG network shared_physical_network True } # Restore xtrace + pipefail |