diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml index 5184a12dc9..25db8ba053 100644 --- a/neutron/Chart.yaml +++ b/neutron/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Neutron name: neutron -version: 0.2.6 +version: 0.2.7 home: https://docs.openstack.org/neutron/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png sources: diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml index 7fea6065b1..e5cb874a80 100644 --- a/neutron/templates/configmap-etc.yaml +++ b/neutron/templates/configmap-etc.yaml @@ -272,7 +272,7 @@ data: bagpipe_bgp.conf: {{ default "\"\"" (include "helm-toolkit.utils.to_oslo_conf" .Values.conf.bagpipe_bgp | b64enc) }} tf_plugin.ini: {{ default "\"\"" (include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.tungstenfabric | b64enc) }} vnc_api_lib.ini: {{ default "\"\"" (include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.tf_vnc_api_lib | b64enc) }} - dnsmasq.conf: "" + dnsmasq.conf: "{{ $envAll.Values.conf.dnsmasq | b64enc }}" neutron_sudoers: {{ $envAll.Values.conf.neutron_sudoers | b64enc }} rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }} auto_bridge_add: {{ toJson $envAll.Values.conf.auto_bridge_add | b64enc }} diff --git a/neutron/values.yaml b/neutron/values.yaml index 6d958106b3..6ce8172b5a 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -2055,6 +2055,23 @@ conf: interface_driver: null dnsmasq_config_file: /etc/neutron/dnsmasq.conf force_metadata: True + dnsmasq: | + #no-hosts + #port=5353 + #cache-size=500 + #no-negcache + #dns-forward-max=100 + #resolve-file= + #strict-order + #bind-interface + #bind-dynamic + #domain= + #dhcp-range=10.10.10.10,10.10.10.100,24h + #dhcp-lease-max=150 + #dhcp-host=11:22:33:44:55:66,ignore + #dhcp-option=3,10.10.10.1 + #dhcp-option-force=26,1450 + l3_agent: DEFAULT: # (NOTE)portdirect: if unset this is populated dyanmicly from the value in diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml index 2065db57f4..d62a665c93 100644 --- a/releasenotes/notes/neutron.yaml +++ b/releasenotes/notes/neutron.yaml @@ -20,4 +20,5 @@ neutron: - 0.2.4 Add Ussuri release support - 0.2.5 Use rootwrap daemon - 0.2.6 Fix neutron agent-init script + - 0.2.7 Made dnsmasq.conf overridable in configmap-bin ...