openstack/openstack-helm
Code Issues Proposed changes

Merge "set openstack_neutron_network configuration from values.yaml"

Browse Source
This commit is contained in:
Jenkins 2017-09-20 02:47:14 +00:00 committed by Gerrit Code Review
commit ae4da1e7ef
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
horizon/templates/etc/_local_settings.tpl
View File

@ -251,15 +251,15 @@ OPENSTACK_CINDER_FEATURES = {
# services provided by neutron. Options currently available are load # services provided by neutron. Options currently available are load
# balancer service, security groups, quotas, VPN service. # balancer service, security groups, quotas, VPN service.
OPENSTACK_NEUTRON_NETWORK = { OPENSTACK_NEUTRON_NETWORK = {
'enable_router': True, 'enable_router': {{ .Values.local_settings.openstack_neutron_network.enable_router }},
'enable_quotas': True, 'enable_quotas': {{ .Values.local_settings.openstack_neutron_network.enable_quotas }},
'enable_ipv6': True, 'enable_ipv6': {{ .Values.local_settings.openstack_neutron_network.enable_ipv6 }},
'enable_distributed_router': False, 'enable_distributed_router': {{ .Values.local_settings.openstack_neutron_network.enable_distributed_router }},
'enable_ha_router': False, 'enable_ha_router': {{ .Values.local_settings.openstack_neutron_network.enable_ha_router }},
'enable_lb': True, 'enable_lb': {{ .Values.local_settings.openstack_neutron_network.enable_lb }},
'enable_firewall': True, 'enable_firewall': {{ .Values.local_settings.openstack_neutron_network.enable_firewall }},
'enable_vpn': True, 'enable_vpn': {{ .Values.local_settings.openstack_neutron_network.enable_vpn }},
'enable_fip_topology_check': True, '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 # The profile_support option is used to detect if an external router can be
# configured via the dashboard. When using specific plugins the # configured via the dashboard. When using specific plugins the

12
horizon/values.yaml
View File

@ -37,9 +37,21 @@ network:
node_port: 31000 node_port: 31000
enable_node_port: false enable_node_port: false
# Use "True" and "False" as Titlecase strings with quotes, boolean
# values will not work
local_settings: local_settings:
horizon_secret_key: 9aee62c0-5253-4a86-b189-e0fb71fa503c horizon_secret_key: 9aee62c0-5253-4a86-b189-e0fb71fa503c
debug: "True" 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: conf:
ceilometer_policy: ceilometer_policy: