summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-24 02:22:49 +0000
committerGerrit Code Review <review@openstack.org>2019-01-24 02:22:49 +0000
commit3f04ed5b8601aa4e44c5dc70fba7ab6fe51a736d (patch)
tree52b117ba7b054c9789106c518076e6f3c5efc476
parent6a21cb58eb406b33afc96f5eabb19b526cab291d (diff)
parent3fb20e7c43c4a6bcdbca20e318da0f5b0c6b1f79 (diff)
Merge "Neutron parameter min_l3_agents_per_router was removed in Ocata"
-rw-r--r--global/software/charts/osh/openstack-compute-kit/neutron.yaml1
-rw-r--r--site/airskiff/software/charts/osh/openstack-compute-kit/neutron.yaml1
2 files changed, 0 insertions, 2 deletions
diff --git a/global/software/charts/osh/openstack-compute-kit/neutron.yaml b/global/software/charts/osh/openstack-compute-kit/neutron.yaml
index 3f33b9b..7119f1d 100644
--- a/global/software/charts/osh/openstack-compute-kit/neutron.yaml
+++ b/global/software/charts/osh/openstack-compute-kit/neutron.yaml
@@ -309,7 +309,6 @@ data:
309 neutron: 309 neutron:
310 DEFAULT: 310 DEFAULT:
311 l3_ha: True 311 l3_ha: True
312 min_l3_agents_per_router: 2
313 max_l3_agents_per_router: 5 312 max_l3_agents_per_router: 5
314 l3_ha_network_type: vxlan 313 l3_ha_network_type: vxlan
315 dhcp_agents_per_network: 2 314 dhcp_agents_per_network: 2
diff --git a/site/airskiff/software/charts/osh/openstack-compute-kit/neutron.yaml b/site/airskiff/software/charts/osh/openstack-compute-kit/neutron.yaml
index d0b48e9..2fa4b2e 100644
--- a/site/airskiff/software/charts/osh/openstack-compute-kit/neutron.yaml
+++ b/site/airskiff/software/charts/osh/openstack-compute-kit/neutron.yaml
@@ -38,7 +38,6 @@ data:
38 neutron: 38 neutron:
39 DEFAULT: 39 DEFAULT:
40 l3_ha: False 40 l3_ha: False
41 min_l3_agents_per_router: 1
42 max_l3_agents_per_router: 1 41 max_l3_agents_per_router: 1
43 l3_ha_network_type: vxlan 42 l3_ha_network_type: vxlan
44 dhcp_agents_per_network: 1 43 dhcp_agents_per_network: 1