From 59e77f21f82af2822e72e4c63dd9cb1542ae37d8 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Wed, 21 Jan 2015 12:15:01 +0000
Subject: [PATCH] Move options around a bit

---
 templates/kilo/nova.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/kilo/nova.conf b/templates/kilo/nova.conf
index b186a473..47489f8b 100644
--- a/templates/kilo/nova.conf
+++ b/templates/kilo/nova.conf
@@ -14,8 +14,6 @@ api_paste_config=/etc/nova/api-paste.ini
 enabled_apis=metadata
 multi_host=True
 {% include "parts/database" %}
-neutron_metadata_proxy_shared_secret={{ shared_secret }}
-service_neutron_metadata_proxy=True
 # Access to message bus
 {% include "parts/rabbitmq" %}
 # Access to neutron API services
@@ -27,3 +25,5 @@ admin_tenant_name={{ service_tenant }}
 admin_username={{ service_username }}
 admin_password={{ service_password }}
 admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
+service_metadata_proxy=True
+metadata_proxy_shared_secret={{ shared_secret }}