Revert "Add shared network for tempest testing"
This reverts commit 486879b995c32325cbc6acae364222a06412512d.
Related-prod: PROD-29645, PROD-29648
Change-Id: Ifff797a75d644faf1e25f8be9cfd91df67cf745a
diff --git a/_modules/runtest/tempest_sections/compute.py b/_modules/runtest/tempest_sections/compute.py
index 62cd318..d131018 100644
--- a/_modules/runtest/tempest_sections/compute.py
+++ b/_modules/runtest/tempest_sections/compute.py
@@ -77,8 +77,7 @@
fixed_network_name = self.get_item_when_condition_match('ironic.conductor.neutron.provisioning_network', c)
if fixed_network_name:
return fixed_network_name
- else:
- return 'tempest-net'
+ return
@property
def flavor_ref(self):
diff --git a/metadata/service/tempest/init.yml b/metadata/service/tempest/init.yml
index f369c09..e4f0dab 100644
--- a/metadata/service/tempest/init.yml
+++ b/metadata/service/tempest/init.yml
@@ -3,7 +3,6 @@
- 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
deleted file mode 100644
index f140a54..0000000
--- a/metadata/service/tempest/tempest_net.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-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