Merge "Neutron parameter min_l3_agents_per_router was removed in Ocata"

2019-01-19 22:16:03 +00:00
parent f5bf6ec2de b5803ad5a8
commit 5b86825680
7 changed files with 0 additions and 7 deletions
--- a/tools/deployment/armada/manifests/armada-osh.yaml
+++ b/tools/deployment/armada/manifests/armada-osh.yaml
@@ -1186,7 +1186,6 @@ data:
      neutron:
        DEFAULT:
          l3_ha: True
-          min_l3_agents_per_router: 2
          max_l3_agents_per_router: 5
          l3_ha_network_type: vxlan
          dhcp_agents_per_network: 2
--- a/tools/deployment/baremetal/110-compute-kit.sh
+++ b/tools/deployment/baremetal/110-compute-kit.sh
@@ -52,7 +52,6 @@ conf:
  neutron:
    DEFAULT:
      l3_ha: False
-      min_l3_agents_per_router: 1
      max_l3_agents_per_router: 1
      l3_ha_network_type: vxlan
      dhcp_agents_per_network: 1
--- a/tools/deployment/component/compute-kit/compute-kit.sh
+++ b/tools/deployment/component/compute-kit/compute-kit.sh
@@ -48,7 +48,6 @@ conf:
  neutron:
    DEFAULT:
      l3_ha: False
-      min_l3_agents_per_router: 1
      max_l3_agents_per_router: 1
      l3_ha_network_type: vxlan
      dhcp_agents_per_network: 1
--- a/tools/deployment/developer/ceph/160-compute-kit.sh
+++ b/tools/deployment/developer/ceph/160-compute-kit.sh
@@ -48,7 +48,6 @@ conf:
  neutron:
    DEFAULT:
      l3_ha: False
-      min_l3_agents_per_router: 1
      max_l3_agents_per_router: 1
      l3_ha_network_type: vxlan
      dhcp_agents_per_network: 1
--- a/tools/deployment/developer/nfs/160-compute-kit.sh
+++ b/tools/deployment/developer/nfs/160-compute-kit.sh
@@ -50,7 +50,6 @@ conf:
  neutron:
    DEFAULT:
      l3_ha: False
-      min_l3_agents_per_router: 1
      max_l3_agents_per_router: 1
      l3_ha_network_type: vxlan
      dhcp_agents_per_network: 1
--- a/tools/deployment/multinode/140-compute-kit.sh
+++ b/tools/deployment/multinode/140-compute-kit.sh
@@ -75,7 +75,6 @@ conf:
  neutron:
    DEFAULT:
      l3_ha: False
-      min_l3_agents_per_router: 1
      max_l3_agents_per_router: 1
      l3_ha_network_type: vxlan
      dhcp_agents_per_network: 1
--- a/tools/overrides/backends/networking/compute-kit-sr-iov.sh
+++ b/tools/overrides/backends/networking/compute-kit-sr-iov.sh
@@ -89,7 +89,6 @@ conf:
    DEFAULT:
      debug: True
      l3_ha: False
-      min_l3_agents_per_router: 1
      max_l3_agents_per_router: 1
      l3_ha_network_type: vxlan
      dhcp_agents_per_network: 1