From eb2dd531b07377b507eeb598972991c42e527e38 Mon Sep 17 00:00:00 2001
From: Jawon Choo <jawon.choo@sk.com>
Date: Wed, 13 Sep 2017 11:37:39 +0900
Subject: [PATCH] set openstack_neutron_network configuration from values.yaml

This PS make openstack_neutron_network values configurable.
For example, when using provider network we need to set router
disable.

Change-Id: I08d81a9aac5f603fc8b7f02853c89b1e09a4c878
Closes-Bug: #1716814
---
 horizon/templates/etc/_local_settings.tpl | 18 +++++++++---------
 horizon/values.yaml                       | 12 ++++++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/horizon/templates/etc/_local_settings.tpl b/horizon/templates/etc/_local_settings.tpl
index 096de2fdb3..7e25c8caf5 100644
--- a/horizon/templates/etc/_local_settings.tpl
+++ b/horizon/templates/etc/_local_settings.tpl
@@ -251,15 +251,15 @@ OPENSTACK_CINDER_FEATURES = {
 # services provided by neutron. Options currently available are load
 # balancer service, security groups, quotas, VPN service.
 OPENSTACK_NEUTRON_NETWORK = {
-    'enable_router': True,
-    'enable_quotas': True,
-    'enable_ipv6': True,
-    'enable_distributed_router': False,
-    'enable_ha_router': False,
-    'enable_lb': True,
-    'enable_firewall': True,
-    'enable_vpn': True,
-    'enable_fip_topology_check': True,
+    'enable_router': {{ .Values.local_settings.openstack_neutron_network.enable_router }},
+    'enable_quotas': {{ .Values.local_settings.openstack_neutron_network.enable_quotas }},
+    'enable_ipv6': {{ .Values.local_settings.openstack_neutron_network.enable_ipv6 }},
+    'enable_distributed_router': {{ .Values.local_settings.openstack_neutron_network.enable_distributed_router }},
+    'enable_ha_router': {{ .Values.local_settings.openstack_neutron_network.enable_ha_router }},
+    'enable_lb': {{ .Values.local_settings.openstack_neutron_network.enable_lb }},
+    'enable_firewall': {{ .Values.local_settings.openstack_neutron_network.enable_firewall }},
+    'enable_vpn': {{ .Values.local_settings.openstack_neutron_network.enable_vpn }},
+    'enable_fip_topology_check': {{ .Values.local_settings.openstack_neutron_network.enable_fip_topology_check }},
 
     # The profile_support option is used to detect if an external router can be
     # configured via the dashboard. When using specific plugins the
diff --git a/horizon/values.yaml b/horizon/values.yaml
index df891c09bf..295d000bdd 100644
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@@ -37,9 +37,21 @@ network:
   node_port: 31000
   enable_node_port: false
 
+# Use "True" and "False" as Titlecase strings with quotes, boolean
+# values will not work
 local_settings:
   horizon_secret_key: 9aee62c0-5253-4a86-b189-e0fb71fa503c
   debug: "True"
+  openstack_neutron_network:
+    enable_router: "True"
+    enable_quotas: "True"
+    enable_ipv6: "True"
+    enable_distributed_router: "False"
+    enable_ha_router: "False"
+    enable_lb: "True"
+    enable_firewall: "True"
+    enable_vpn: "True"
+    enable_fip_topology_check: "True"
 
 conf:
   ceilometer_policy: