diff --git a/nova/files/liberty/nova-controller.conf.Debian b/nova/files/liberty/nova-controller.conf.Debian
index 1109fa4..0c2f11a 100644
--- a/nova/files/liberty/nova-controller.conf.Debian
+++ b/nova/files/liberty/nova-controller.conf.Debian
@@ -99,10 +99,6 @@
 novncproxy_base_url={{ controller.vncproxy_url }}/vnc_auto.html
 novncproxy_port={{ controller.bind.get('vncproxy_port', '6080') }}
 
-{%- if controller.get('networking', 'default') != "contrail" %}
-neutron_metadata_proxy_shared_secret={{ controller.metadata.password }}
-{%- endif %}
-
 allow_resize_to_same_host=True
 
 rpc_cast_timeout = 30
@@ -215,6 +211,9 @@
 {%- endif %}
 url=http://{{ controller.network.host }}:{{ controller.network.port }}
 
+{%- if controller.get('networking', 'default') != "contrail" %}
+metadata_proxy_shared_secret={{ controller.metadata.password }}
+{%- endif %}
 service_metadata_proxy=True
 
 [cinder]
diff --git a/nova/files/mitaka/nova-controller.conf.Debian b/nova/files/mitaka/nova-controller.conf.Debian
index f03eecc..4554ca1 100644
--- a/nova/files/mitaka/nova-controller.conf.Debian
+++ b/nova/files/mitaka/nova-controller.conf.Debian
@@ -55,11 +55,6 @@
 osapi_compute_workers = {{ controller.workers }}
 metadata_workers = {{ controller.workers }}
 
-
-{%- if controller.get('networking', 'default') != "contrail" %}
-neutron_metadata_proxy_shared_secret={{ controller.metadata.password }}
-{%- endif %}
-
 allow_resize_to_same_host=True
 
 rpc_cast_timeout = 30
@@ -199,6 +194,9 @@
 {%- endif %}
 url=http://{{ controller.network.host }}:{{ controller.network.port }}
 
+{%- if controller.get('networking', 'default') != "contrail" %}
+metadata_proxy_shared_secret={{ controller.metadata.password }}
+{%- endif %}
 service_metadata_proxy=True
 
 [cinder]