openstack/openstack-ansible-os_tempest
Code Issues Proposed changes

Fix tempest neutron setup tasks

Browse Source 
1) Allow the creation of network types outside the norm of vxlan/vlan.
2) tempest_public_physical_net_type was used in the resources setup
   tasks, while it was defined in defaults as
   tempest_public_net_physical_type.
3) Consolidate the public network setup task from "if flat" and "if
   vlan" into something that will accommodate other network types
   such as local.
4) Do not require a segmentation id on private network setup,
   enabling the use of types other than vxlan/vlan.

Change-Id: I54de9862686f9c67266d4c7335f00c0553202c85
This commit is contained in:
Logan V 2016-08-13 11:38:33 -05:00
parent a467fcf9dc
commit 403fcf8e19
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tasks/tempest_resources.yml
View File

@ -209,7 +209,7 @@
openrc_path: /root/openrc
net_name: private
provider_network_type: "{{ tempest_private_net_provider_type }}"
provider_segmentation_id: "{{ tempest_private_net_seg_id }}"
provider_segmentation_id: "{{ tempest_private_net_seg_id | default(omit) }}"
tenant_id: "{{ keystone_demo_tenant_id }}"
insecure: "{{ keystone_service_internaluri_insecure }}"
when: tempest_service_available_neutron | bool
@ -225,36 +225,19 @@
- tempest-setup
- tempest-config
- name: Ensure public network exists (if flat)
- name: Ensure public network exists
neutron:
command: create_network
openrc_path: /root/openrc
net_name: public
provider_network_type: "{{ tempest_public_net_provider_type }}"
provider_physical_network: "{{ tempest_public_net_physical_type }}"
router_external: "{{ tempest_public_router_external }}"
insecure: "{{ keystone_service_internaluri_insecure }}"
when:
- tempest_service_available_neutron | bool
- tempest_public_net_provider_type == "flat"
tags:
- tempest-setup
- tempest-config
- name: Ensure public network exists (if vlan)
neutron:
command: create_network
openrc_path: /root/openrc
net_name: public
provider_network_type: "{{ tempest_public_net_provider_type }}"
provider_physical_network: "{{ tempest_public_physical_net_type }}"
provider_segmentation_id: "{{ tempest_public_net_seg_id }}"
provider_physical_network: "{{ tempest_public_net_physical_type | default(omit) }}"
provider_segmentation_id: "{{ tempest_public_net_seg_id | default(omit) }}"
router_external: "{{ tempest_public_router_external }}"
tenant_id: "{{ keystone_demo_tenant_id }}"
insecure: "{{ keystone_service_internaluri_insecure }}"
when:
- tempest_service_available_neutron | bool
- tempest_public_net_provider_type == "vlan"
tags:
- tempest-setup
- tempest-config