From 7bf7996c79ef8078724d54cd5111f4927acdbf65 Mon Sep 17 00:00:00 2001 From: Daniel Alvarez Date: Mon, 1 Oct 2018 12:41:22 +0200 Subject: [PATCH] Remove unused parameter NeutronEnableDHCPAgent NeutronEnableDHCPAgent is no longer consumed anywhere in OpenStack so this patch is removing all occurrences of it in the environment files. Change-Id: I042944c3f24d22fa60d4ed13fd9a56c5b93f465f Signed-off-by: Daniel Alvarez --- ci/environments/scenario007-multinode-containers.yaml | 1 - environments/neutron-ml2-ovn-dvr-ha.yaml | 1 - environments/neutron-ml2-ovn-ha.yaml | 1 - environments/neutron-ml2-ovn-hw-offload.yaml | 1 - environments/services-baremetal/neutron-ovn-dvr-ha.yaml | 1 - environments/services-baremetal/neutron-ovn-ha.yaml | 1 - environments/services-baremetal/neutron-ovn-hw-offload.yaml | 1 - environments/services/neutron-ovn-dvr-ha.yaml | 1 - environments/services/neutron-ovn-ha.yaml | 1 - environments/services/neutron-ovn-hw-offload.yaml | 1 - 10 files changed, 10 deletions(-) diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml index 111e70bb50..040939000d 100644 --- a/ci/environments/scenario007-multinode-containers.yaml +++ b/ci/environments/scenario007-multinode-containers.yaml @@ -69,7 +69,6 @@ parameter_defaults: OVNNeutronSyncMode: log OVNQosDriver: ovn-qos OVNTunnelEncapType: geneve - NeutronEnableDHCPAgent: false NeutronTypeDrivers: 'geneve,vlan,flat,vxlan' NeutronNetworkType: 'geneve' NeutronServicePlugins: 'qos,networking_ovn.l3.l3_ovn.OVNL3RouterPlugin' diff --git a/environments/neutron-ml2-ovn-dvr-ha.yaml b/environments/neutron-ml2-ovn-dvr-ha.yaml index b3c6d8ea2a..a3e7d79e87 100644 --- a/environments/neutron-ml2-ovn-dvr-ha.yaml +++ b/environments/neutron-ml2-ovn-dvr-ha.yaml @@ -20,7 +20,6 @@ parameter_defaults: OVNNeutronSyncMode: log OVNQosDriver: ovn-qos OVNTunnelEncapType: geneve - NeutronEnableDHCPAgent: false NeutronTypeDrivers: 'geneve,vlan,flat' NeutronNetworkType: 'geneve' NeutronServicePlugins: 'qos,ovn-router,trunk' diff --git a/environments/neutron-ml2-ovn-ha.yaml b/environments/neutron-ml2-ovn-ha.yaml index dcf79765d0..e5acec21b1 100644 --- a/environments/neutron-ml2-ovn-ha.yaml +++ b/environments/neutron-ml2-ovn-ha.yaml @@ -19,7 +19,6 @@ parameter_defaults: OVNNeutronSyncMode: log OVNQosDriver: ovn-qos OVNTunnelEncapType: geneve - NeutronEnableDHCPAgent: false NeutronTypeDrivers: 'geneve,vlan,flat' NeutronNetworkType: 'geneve' NeutronServicePlugins: 'qos,ovn-router,trunk' diff --git a/environments/neutron-ml2-ovn-hw-offload.yaml b/environments/neutron-ml2-ovn-hw-offload.yaml index 3d26db2304..5ead8d7544 100644 --- a/environments/neutron-ml2-ovn-hw-offload.yaml +++ b/environments/neutron-ml2-ovn-hw-offload.yaml @@ -19,7 +19,6 @@ parameter_defaults: OVNNeutronSyncMode: log OVNQosDriver: ovn-qos OVNTunnelEncapType: geneve - NeutronEnableDHCPAgent: false NeutronTypeDrivers: 'geneve,vlan,flat' NeutronNetworkType: 'geneve' NeutronServicePlugins: 'qos,ovn-router,trunk' diff --git a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml index 0c6e2afeeb..20d51c499c 100644 --- a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml +++ b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml @@ -20,7 +20,6 @@ parameter_defaults: OVNNeutronSyncMode: log OVNQosDriver: ovn-qos OVNTunnelEncapType: geneve - NeutronEnableDHCPAgent: false NeutronTypeDrivers: 'geneve,vlan,flat' NeutronNetworkType: 'geneve' NeutronServicePlugins: 'qos,ovn-router,trunk' diff --git a/environments/services-baremetal/neutron-ovn-ha.yaml b/environments/services-baremetal/neutron-ovn-ha.yaml index 50a150fd68..6857a27e5a 100644 --- a/environments/services-baremetal/neutron-ovn-ha.yaml +++ b/environments/services-baremetal/neutron-ovn-ha.yaml @@ -19,7 +19,6 @@ parameter_defaults: OVNNeutronSyncMode: log OVNQosDriver: ovn-qos OVNTunnelEncapType: geneve - NeutronEnableDHCPAgent: false NeutronTypeDrivers: 'geneve,vlan,flat' NeutronNetworkType: 'geneve' NeutronServicePlugins: 'qos,ovn-router,trunk' diff --git a/environments/services-baremetal/neutron-ovn-hw-offload.yaml b/environments/services-baremetal/neutron-ovn-hw-offload.yaml index bcbbbab835..d986a7871e 100644 --- a/environments/services-baremetal/neutron-ovn-hw-offload.yaml +++ b/environments/services-baremetal/neutron-ovn-hw-offload.yaml @@ -20,7 +20,6 @@ parameter_defaults: OVNNeutronSyncMode: log OVNQosDriver: ovn-qos OVNTunnelEncapType: geneve - NeutronEnableDHCPAgent: false NeutronTypeDrivers: 'geneve,vlan,flat' NeutronNetworkType: 'geneve' NeutronServicePlugins: 'qos,ovn-router,trunk' diff --git a/environments/services/neutron-ovn-dvr-ha.yaml b/environments/services/neutron-ovn-dvr-ha.yaml index 961250fd58..1ed9fdd622 100644 --- a/environments/services/neutron-ovn-dvr-ha.yaml +++ b/environments/services/neutron-ovn-dvr-ha.yaml @@ -21,7 +21,6 @@ parameter_defaults: OVNNeutronSyncMode: log OVNQosDriver: ovn-qos OVNTunnelEncapType: geneve - NeutronEnableDHCPAgent: false NeutronTypeDrivers: 'geneve,vlan,flat' NeutronNetworkType: 'geneve' NeutronServicePlugins: 'qos,ovn-router,trunk' diff --git a/environments/services/neutron-ovn-ha.yaml b/environments/services/neutron-ovn-ha.yaml index 1224277476..76b9bcb200 100644 --- a/environments/services/neutron-ovn-ha.yaml +++ b/environments/services/neutron-ovn-ha.yaml @@ -19,7 +19,6 @@ parameter_defaults: OVNNeutronSyncMode: log OVNQosDriver: ovn-qos OVNTunnelEncapType: geneve - NeutronEnableDHCPAgent: false NeutronTypeDrivers: 'geneve,vlan,flat' NeutronNetworkType: 'geneve' NeutronServicePlugins: 'qos,ovn-router,trunk' diff --git a/environments/services/neutron-ovn-hw-offload.yaml b/environments/services/neutron-ovn-hw-offload.yaml index 88e4aefcad..9b016b0424 100644 --- a/environments/services/neutron-ovn-hw-offload.yaml +++ b/environments/services/neutron-ovn-hw-offload.yaml @@ -20,7 +20,6 @@ parameter_defaults: OVNNeutronSyncMode: log OVNQosDriver: ovn-qos OVNTunnelEncapType: geneve - NeutronEnableDHCPAgent: false NeutronTypeDrivers: 'geneve,vlan,flat' NeutronNetworkType: 'geneve' NeutronServicePlugins: 'qos,ovn-router,trunk'