Merge "Add parameters for tests test_server_ips_recordset"
diff --git a/_modules/runtest/tempest_sections/compute.py b/_modules/runtest/tempest_sections/compute.py
index d131018..62cd318 100644
--- a/_modules/runtest/tempest_sections/compute.py
+++ b/_modules/runtest/tempest_sections/compute.py
@@ -77,7 +77,8 @@
fixed_network_name = self.get_item_when_condition_match('ironic.conductor.neutron.provisioning_network', c)
if fixed_network_name:
return fixed_network_name
- return
+ else:
+ return 'tempest-net'
@property
def flavor_ref(self):
diff --git a/metadata/service/tempest/init.yml b/metadata/service/tempest/init.yml
index e4f0dab..f369c09 100644
--- a/metadata/service/tempest/init.yml
+++ b/metadata/service/tempest/init.yml
@@ -3,6 +3,7 @@
- service.runtest.tempest.glance
- service.runtest.tempest.nova
- service.runtest.tempest.heat
+ - service.runtest.tempest.tempest_net
applications:
- runtest
parameters:
diff --git a/metadata/service/tempest/tempest_net.yml b/metadata/service/tempest/tempest_net.yml
new file mode 100644
index 0000000..f140a54
--- /dev/null
+++ b/metadata/service/tempest/tempest_net.yml
@@ -0,0 +1,20 @@
+parameters:
+ neutron:
+ client:
+ enabled: true
+ server:
+ admin_identity:
+ network:
+ tempest-net:
+ tenant: admin
+ shared: True
+ router_external: False
+ admin_state_up: True
+ subnet:
+ tempest-subnet:
+ cidr: 10.20.40.0/24
+ allocation_pools:
+ - start: 10.20.40.10
+ end: 10.20.40.254
+ gateway: 10.20.40.1
+ enable_dhcp: True
\ No newline at end of file