From 8e5ae2618d5e206f4ab9d8262e6287bd278d85af Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Mon, 10 Nov 2014 10:31:52 +0000
Subject: [PATCH] Switch to current options in nova.conf

Switch some nova.conf options to the most current name/group,
the old names were deprecated in nova in Juno and have now
been removed.
Closes-Bug: #1390427

Change-Id: I7eb06d70aba99592152559252fb2bf2058dc39c6
---
 .../nova/os-apply-config/etc/nova/nova.conf   | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/elements/nova/os-apply-config/etc/nova/nova.conf b/elements/nova/os-apply-config/etc/nova/nova.conf
index 6b87d5e48..4ff424eb2 100644
--- a/elements/nova/os-apply-config/etc/nova/nova.conf
+++ b/elements/nova/os-apply-config/etc/nova/nova.conf
@@ -56,8 +56,6 @@ api_paste_config=/etc/nova/api-paste.ini
 # Auth
 auth_strategy=keystone
 keystone_ec2_url=http://{{keystone.host}}:5000/v2.0/ec2tokens
-# Imaging service
-glance_api_servers={{glance.protocol}}://{{glance.host}}:{{glance.port}}
 
 # VNC configuration
 {{#nova.public_ip}}
@@ -85,17 +83,7 @@ vncserver_listen=0.0.0.0
 default_floating_pool={{nova.default_floating_pool}}
 {{/nova.default_floating_pool}}
 network_api_class=nova.network.neutronv2.api.API
-neutron_url=http://{{neutron.host}}:9696
-neutron_auth_strategy=keystone
-neutron_admin_tenant_name=service
-neutron_admin_username=neutron
-neutron_admin_password={{neutron.service-password}}
-neutron_admin_auth_url=http://{{keystone.host}}:35357/v2.0
 linuxnet_interface_driver=nova.network.linux_net.LinuxOVSInterfaceDriver
-service_neutron_metadata_proxy={{nova.metadata-proxy}}
-{{#neutron.metadata_proxy_shared_secret}}
-neutron_metadata_proxy_shared_secret={{neutron.metadata_proxy_shared_secret}}
-{{/neutron.metadata_proxy_shared_secret}}
 
 dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
@@ -106,7 +94,6 @@ firewall_driver=nova.virt.firewall.NoopFirewallDriver
 
 # Cinder #
 volume_api_class=nova.volume.cinder.API
-cinder_catalog_info=volume:cinder:publicURL
 
 {{#rabbit}}
 rabbit_password={{password}}
@@ -186,6 +173,24 @@ scheduler_host_manager = nova.scheduler.baremetal_host_manager.BaremetalHostMana
 [database]
 connection={{nova.db}}
 
+[neutron]
+url=http://{{neutron.host}}:9696
+auth_strategy=keystone
+admin_username=neutron
+admin_tenant_name=service
+admin_password={{neutron.service-password}}
+admin_auth_url=http://{{keystone.host}}:35357/v2.0
+service_metadata_proxy={{nova.metadata-proxy}}
+{{#neutron.metadata_proxy_shared_secret}}
+metadata_proxy_shared_secret={{neutron.metadata_proxy_shared_secret}}
+{{/neutron.metadata_proxy_shared_secret}}
+
+[glance]
+api_servers={{glance.protocol}}://{{glance.host}}:{{glance.port}}
+
+[cinder]
+catalog_info=volume:cinder:publicURL
+
 {{#nova.baremetal}}
 [baremetal]
 sql_connection = {{db}}