openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "tempest: conditional --provider:physical_network"

Browse Source
This commit is contained in:
Zuul 2017-11-08 20:43:29 +00:00 committed by Gerrit Code Review
commit 4aff970c23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/validate-tempest/README.md
View File

@ -37,6 +37,7 @@ Role Variables
* `tempest_conf_removal`: dict - A dict of tempest configuration which will be * `tempest_conf_removal`: dict - A dict of tempest configuration which will be
removed from tempest.conf file. removed from tempest.conf file.
Format: section.key: value Format: section.key: value
* `public_physical_network`: <string> The name of the border physical network (default: datacentre).
Skip tests file Skip tests file
--------------- ---------------

3
roles/validate-tempest/templates/configure-tempest.sh.j2
View File

@ -42,11 +42,14 @@ for i in $(neutron port-list -c id -f value); do neutron port-delete $i; done
for i in $(neutron net-list -c id -f value); do neutron net-delete $i; done for i in $(neutron net-list -c id -f value); do neutron net-delete $i; done
neutron net-create {{ public_net_name }} --router:external=True \ neutron net-create {{ public_net_name }} --router:external=True \
{% if public_physical_network != '' %}
--provider:network_type {{ public_network_type }} \ --provider:network_type {{ public_network_type }} \
{% if public_segmentation_id != '' %} {% if public_segmentation_id != '' %}
--provider:segmentation_id {{ public_segmentation_id }} \ --provider:segmentation_id {{ public_segmentation_id }} \
{% endif %} {% endif %}
--provider:physical_network {{ public_physical_network }} --provider:physical_network {{ public_physical_network }}
{% endif %}
public_net_id=$(neutron net-show {{ public_net_name }} -f value -c id) public_net_id=$(neutron net-show {{ public_net_name }} -f value -c id)