Revert "Revert "Disable DHCP on the networks""
This reverts commit 63dba6e7d6ea0b8c45c862391587101f58592fe0.
Reason for revert: PRODX-21275
Change-Id: I759d7860ec11163b134c6a4c5d19599b2264cef5
diff --git a/de/heat-templates/fragments/NetworkAccVM.yaml b/de/heat-templates/fragments/NetworkAccVM.yaml
index 9cd2c77..4954b0f 100644
--- a/de/heat-templates/fragments/NetworkAccVM.yaml
+++ b/de/heat-templates/fragments/NetworkAccVM.yaml
@@ -34,7 +34,7 @@
type: OS::Neutron::Subnet
properties:
network: { get_resource: network }
- enable_dhcp: true
+ enable_dhcp: false
cidr: { get_param: control_network_cidr }
dns_nameservers: { get_param: dns_nameservers }
host_routes: { get_param: control_network_host_routes }
diff --git a/de/heat-templates/fragments/NetworkAccVMStorage.yaml b/de/heat-templates/fragments/NetworkAccVMStorage.yaml
index 154976f..f1475b3 100644
--- a/de/heat-templates/fragments/NetworkAccVMStorage.yaml
+++ b/de/heat-templates/fragments/NetworkAccVMStorage.yaml
@@ -14,7 +14,7 @@
type: OS::Neutron::Subnet
properties:
network: { get_resource: storage_backend_network }
- enable_dhcp: true
+ enable_dhcp: false
cidr: { get_param: storage_backend_network_cidr }
gateway_ip: ~
@@ -24,7 +24,7 @@
type: OS::Neutron::Subnet
properties:
network: { get_resource: storage_frontend_network }
- enable_dhcp: true
+ enable_dhcp: false
cidr: { get_param: storage_frontend_network_cidr }
gateway_ip: ~