Use network 'heat-net' for integration_tests
Neutron support for ipv6 is not complete yet (ex. LBaaS
only supports ipv4). We'had some gate issues after dual
stack was enabled in devstack. We had put some tactical
fixes to resolve those[1][2].
This fix adds usage of heat-net/heat-subnet(only ipv4)
for integration tests. This also rolls back the earlier
tactical changes.
https://review.openstack.org/#/c/178576
https://review.openstack.org/#/c/178933/
Change-Id: Ia863edb8932b8dea5c4fa110c97dcfdadca85bb9
diff --git a/scenario/templates/test_neutron_autoscaling.yaml b/scenario/templates/test_neutron_autoscaling.yaml
index 59aad2c..a34ec43 100644
--- a/scenario/templates/test_neutron_autoscaling.yaml
+++ b/scenario/templates/test_neutron_autoscaling.yaml
@@ -11,7 +11,7 @@
type: string
label: Capacity
description: Auto-scaling group desired capacity
- fixed_subnet_name:
+ fixed_subnet:
type: string
label: fixed subnetwork ID
description: subnetwork ID used for autoscaling
@@ -28,7 +28,7 @@
lb_method: ROUND_ROBIN
name: test_pool
protocol: HTTP
- subnet: { get_param: fixed_subnet_name }
+ subnet: { get_param: fixed_subnet }
vip: {
"description": "Test VIP",
"protocol_port": 80,
@@ -49,6 +49,7 @@
properties:
AvailabilityZones : ["nova"]
LaunchConfigurationName : { get_resource : launch_config }
+ VPCZoneIdentifier: [{ get_param: fixed_subnet }]
MinSize : 1
MaxSize : 5
DesiredCapacity: { get_param: capacity }
diff --git a/scenario/templates/test_neutron_loadbalancer.yaml b/scenario/templates/test_neutron_loadbalancer.yaml
index b0c48c2..dd659d0 100644
--- a/scenario/templates/test_neutron_loadbalancer.yaml
+++ b/scenario/templates/test_neutron_loadbalancer.yaml
@@ -10,6 +10,8 @@
type: string
image:
type: string
+ network:
+ type: string
private_subnet_id:
type: string
external_network_id:
@@ -66,6 +68,7 @@
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
+ networks: [{network: {get_param: network} }]
security_groups: [{ get_resource: sec_group }]
user_data_format: SOFTWARE_CONFIG
user_data: { get_resource: config }
@@ -77,6 +80,7 @@
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
+ networks: [{network: {get_param: network} }]
security_groups: [{ get_resource: sec_group }]
user_data_format: SOFTWARE_CONFIG
user_data: { get_resource: config }
@@ -119,10 +123,10 @@
- { get_resource: server1 }
outputs:
- serv1_addresses:
- value: {get_attr: [server1, addresses, private]}
- serv2_addresses:
- value: {get_attr: [server2, addresses, private]}
+ serv1_ip:
+ value: {get_attr: [server1, networks, { get_param: network }, 0]}
+ serv2_ip:
+ value: {get_attr: [server2, networks, { get_param: network }, 0]}
vip:
value: {get_attr: [test_pool, vip, address]}
fip: