diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml
index 77dbd205c7..b905caff1f 100644
--- a/neutron/templates/configmap-etc.yaml
+++ b/neutron/templates/configmap-etc.yaml
@@ -24,7 +24,7 @@
 {{- include "neutron.conf.ml2_conf_sriov_values_skeleton" .Values.conf.ml2_conf_sriov | trunc 0 -}}
 {{- include "neutron.conf.openvswitch_agent_values_skeleton" .Values.conf.openvswitch_agent | trunc 0 -}}
 {{- include "neutron.conf.sriov_agent_values_skeleton" .Values.conf.sriov_agent | trunc 0 -}}
- 
+
 {{- if empty .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}}
 {{- tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup"| set .Values.conf.neutron.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}}
 {{- end }}
@@ -161,7 +161,7 @@ data:
 {{- end }}
 {{- if .Values.conf.ml2_conf_sriov.append -}}
 {{ .Values.conf.ml2_conf_sriov.append | indent 4 }}
-{{- end }} 
+{{- end }}
   macvtap_agent.ini: |+
 {{ if .Values.conf.macvtap_agent.override -}}
 {{ .Values.conf.macvtap_agent.override | indent 4 }}
@@ -173,7 +173,7 @@ data:
 {{- end }}
 {{- if .Values.conf.macvtap_agent.append -}}
 {{ .Values.conf.macvtap_agent.append | indent 4 }}
-{{- end }} 
+{{- end }}
   linuxbridge_agent.ini: |+
 {{ if .Values.conf.linuxbridge_agent.override -}}
 {{ .Values.conf.linuxbridge_agent.override | indent 4 }}
@@ -185,7 +185,7 @@ data:
 {{- end }}
 {{- if .Values.conf.linuxbridge_agent.append -}}
 {{ .Values.conf.linuxbridge_agent.append | indent 4 }}
-{{- end }} 
+{{- end }}
   openvswitch_agent.ini: |+
 {{ if .Values.conf.openvswitch_agent.override -}}
 {{ .Values.conf.openvswitch_agent.override | indent 4 }}
@@ -213,4 +213,3 @@ data:
   resolv.conf: |+
 {{ tuple "etc/_resolv.conf.tpl" . | include "helm-toolkit.template" | indent 4 }}
   dnsmasq.conf: ""
-
diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml
index 4157b99918..b5ae10c53b 100644
--- a/neutron/templates/daemonset-dhcp-agent.yaml
+++ b/neutron/templates/daemonset-dhcp-agent.yaml
@@ -40,7 +40,7 @@ spec:
         - name: neutron-dhcp-agent
           image: {{ .Values.images.dhcp }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-          {{- if .Values.resources.enabled }}  
+          {{- if .Values.resources.enabled }}
           resources:
             limits:
               cpu: {{ .Values.resources.agent.dhcp.limits.cpu | quote }}
diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml
index 087b2ad077..eb28994341 100644
--- a/neutron/templates/daemonset-l3-agent.yaml
+++ b/neutron/templates/daemonset-l3-agent.yaml
@@ -40,7 +40,7 @@ spec:
         - name: neutron-l3-agent
           image: {{ .Values.images.l3 }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-          {{- if .Values.resources.enabled }}             
+          {{- if .Values.resources.enabled }}
           resources:
             limits:
               cpu: {{ .Values.resources.agent.l3.limits.cpu | quote }}
diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml
index 836c23e2d8..07307d3b52 100644
--- a/neutron/templates/daemonset-metadata-agent.yaml
+++ b/neutron/templates/daemonset-metadata-agent.yaml
@@ -40,7 +40,7 @@ spec:
         - name: neutron-metadata-agent
           image: {{ .Values.images.metadata }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-          {{- if .Values.resources.enabled }}         
+          {{- if .Values.resources.enabled }}
           resources:
             limits:
               cpu: {{ .Values.resources.agent.metadata.limits.cpu | quote }}
diff --git a/neutron/templates/daemonset-ovs-db.yaml b/neutron/templates/daemonset-ovs-db.yaml
index 80e98dfb3e..635d783f91 100644
--- a/neutron/templates/daemonset-ovs-db.yaml
+++ b/neutron/templates/daemonset-ovs-db.yaml
@@ -35,7 +35,7 @@ spec:
         - name: ovs-db
           image: {{ .Values.images.openvswitch_db_server }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-          {{- if .Values.resources.enabled }}         
+          {{- if .Values.resources.enabled }}
           resources:
             limits:
               cpu: {{ .Values.resources.ovs.db.limits.cpu | quote }}
diff --git a/neutron/templates/etc/_dhcp_agent.ini.tpl b/neutron/templates/etc/_dhcp_agent.ini.tpl
index 1f0ef83b6e..81f3cdab0b 100644
--- a/neutron/templates/etc/_dhcp_agent.ini.tpl
+++ b/neutron/templates/etc/_dhcp_agent.ini.tpl
@@ -290,4 +290,3 @@
 {{ if not .agent.neutron.base.agent.availability_zone }}#{{ end }}availability_zone = {{ .agent.neutron.base.agent.availability_zone | default "nova" }}
 
 {{- end -}}
-
diff --git a/neutron/templates/etc/_l3_agent.ini.tpl b/neutron/templates/etc/_l3_agent.ini.tpl
index ac748e2cda..3963458415 100644
--- a/neutron/templates/etc/_l3_agent.ini.tpl
+++ b/neutron/templates/etc/_l3_agent.ini.tpl
@@ -352,4 +352,3 @@
 {{ if not .agent.neutron.base.agent.availability_zone }}#{{ end }}availability_zone = {{ .agent.neutron.base.agent.availability_zone | default "nova" }}
 
 {{- end -}}
-
diff --git a/neutron/templates/etc/_metadata_agent.ini.tpl b/neutron/templates/etc/_metadata_agent.ini.tpl
index 8fc45855ea..02fb932e8a 100644
--- a/neutron/templates/etc/_metadata_agent.ini.tpl
+++ b/neutron/templates/etc/_metadata_agent.ini.tpl
@@ -344,4 +344,3 @@
 {{ if not .cache.oslo.cache.memcache_pool_connection_get_timeout }}#{{ end }}memcache_pool_connection_get_timeout = {{ .cache.oslo.cache.memcache_pool_connection_get_timeout | default "10" }}
 
 {{- end -}}
-
diff --git a/neutron/templates/etc/_metering_agent.ini.tpl b/neutron/templates/etc/_metering_agent.ini.tpl
index 81ad7e73c6..f07c6ebf9f 100644
--- a/neutron/templates/etc/_metering_agent.ini.tpl
+++ b/neutron/templates/etc/_metering_agent.ini.tpl
@@ -171,4 +171,3 @@
 {{ if not .default.oslo.log.fatal_deprecations }}#{{ end }}fatal_deprecations = {{ .default.oslo.log.fatal_deprecations | default "false" }}
 
 {{- end -}}
-
diff --git a/neutron/templates/etc/_neutron.conf.tpl b/neutron/templates/etc/_neutron.conf.tpl
index 1052c60556..634156b7af 100644
--- a/neutron/templates/etc/_neutron.conf.tpl
+++ b/neutron/templates/etc/_neutron.conf.tpl
@@ -1057,8 +1057,8 @@
 # From keystonemiddleware.auth_token
 #
 
-# FIXME(alanmeadows) - added the next several lines because oslo gen config refuses to generate the line items required in keystonemiddleware 
-# for authentication - while it does support an "auth_section" parameter to locate these elsewhere, it would be a strange divergence 
+# FIXME(alanmeadows) - added the next several lines because oslo gen config refuses to generate the line items required in keystonemiddleware
+# for authentication - while it does support an "auth_section" parameter to locate these elsewhere, it would be a strange divergence
 # from how neutron keystone authentication is stored today - ocata and later appear to use a "service" user section which can house these details
 # and does successfully generate beyond newton, so likely this whole section will be removed the next time we generate this file
 
@@ -2229,4 +2229,3 @@
 {{ if not .ssl.oslo.service.sslutils.ciphers }}#{{ end }}ciphers = {{ .ssl.oslo.service.sslutils.ciphers | default "<None>" }}
 
 {{- end -}}
-
diff --git a/neutron/templates/etc/plugins/_ml2_conf_sriov.ini.tpl b/neutron/templates/etc/plugins/_ml2_conf_sriov.ini.tpl
index e6e657a57a..4b968c00a1 100644
--- a/neutron/templates/etc/plugins/_ml2_conf_sriov.ini.tpl
+++ b/neutron/templates/etc/plugins/_ml2_conf_sriov.ini.tpl
@@ -169,4 +169,3 @@
 {{ if not .ml2_sriov.neutron.ml2.sriov.supported_pci_vendor_devs }}#{{ end }}supported_pci_vendor_devs = {{ .ml2_sriov.neutron.ml2.sriov.supported_pci_vendor_devs | default "<None>" }}
 
 {{- end -}}
-
diff --git a/neutron/templates/etc/plugins/_openvswitch_agent.ini.tpl b/neutron/templates/etc/plugins/_openvswitch_agent.ini.tpl
index 487a857ae9..8213f0d485 100644
--- a/neutron/templates/etc/plugins/_openvswitch_agent.ini.tpl
+++ b/neutron/templates/etc/plugins/_openvswitch_agent.ini.tpl
@@ -380,4 +380,3 @@
 {{ if not .securitygroup.neutron.ml2.ovs.agent.enable_ipset }}#{{ end }}enable_ipset = {{ .securitygroup.neutron.ml2.ovs.agent.enable_ipset | default "true" }}
 
 {{- end -}}
-
diff --git a/neutron/templates/etc/plugins/_sriov_agent.ini.tpl b/neutron/templates/etc/plugins/_sriov_agent.ini.tpl
index c2a5db047c..494d07ec0b 100644
--- a/neutron/templates/etc/plugins/_sriov_agent.ini.tpl
+++ b/neutron/templates/etc/plugins/_sriov_agent.ini.tpl
@@ -193,4 +193,3 @@
 {{ if not .sriov_nic.neutron.ml2.sriov.agent.exclude_devices }}#{{ end }}exclude_devices = {{ .sriov_nic.neutron.ml2.sriov.agent.exclude_devices | default "" }}
 
 {{- end -}}
-
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 7c2b48ddad..51a8c73e93 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -103,7 +103,7 @@ keystone:
   neutron_password: "password"
   neutron_project_name: "service"
   neutron_project_domain: "default"
-  neutron_region_name: "RegionOne"  
+  neutron_region_name: "RegionOne"
 
 metadata_agent:
   default:
@@ -303,7 +303,7 @@ conf:
     oslo_messaging_notifications:
       oslo:
         messaging:
-          driver: 
+          driver:
           - noop
     nova:
       nova:
@@ -324,7 +324,7 @@ conf:
           project_name: admin
           user_domain_name: default
           username: admin
-          password: password          
+          password: password
   ml2_conf:
     override:
     append:
@@ -367,7 +367,7 @@ conf:
     default:
       neutron:
         l3:
-          agent:      
+          agent:
             agent_mode: legacy
             enable_metadata_proxy: True
             enable_isolated_metadata: True
@@ -392,7 +392,7 @@ conf:
     append:
   macvtap_agent:
     override:
-    append:    
+    append:
   linuxbridge_agent:
     override:
     append:
@@ -429,12 +429,12 @@ endpoints:
      path: /
      scheme: rabbit
      port:
-       amqp: 5672  
+       amqp: 5672
   oslo_cache:
      hosts:
        default: memcache
      port:
-       memcache: 11211        
+       memcache: 11211
   compute:
     name: nova
     hosts: