From 851540d472dae0b8198214f7d9e5918d5e1c1551 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Sat, 23 Aug 2014 21:16:15 +0200
Subject: [PATCH] Follow rename of glance settings in nova.conf

Some settings have been moved and renamed from
[DEFAULT] to [glance] for Juno.

Change-Id: I2cf821bd3018770f5a538e40753c520831e798c0
Partial-Bug: #1332366
---
 doc/common/samples/nova.conf                                | 5 ++++-
 doc/common/samples/nova.conf-yum                            | 5 ++++-
 doc/config-reference/compute/section_hypervisor_hyper-v.xml | 3 ++-
 doc/install-guide/section_nova-compute-install.xml          | 6 +++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/doc/common/samples/nova.conf b/doc/common/samples/nova.conf
index a5e4a341ee..c4d5229611 100644
--- a/doc/common/samples/nova.conf
+++ b/doc/common/samples/nova.conf
@@ -32,7 +32,6 @@ rabbit_host=192.168.206.130
 
 # GLANCE
 image_service=nova.image.glance.GlanceImageService
-glance_api_servers=192.168.206.130:9292
 
 # NETWORK
 network_manager=nova.network.manager.FlatDHCPManager
@@ -63,6 +62,10 @@ admin_user = nova
 admin_password = nova
 signing_dirname = /tmp/keystone-signing-nova
 
+# GLANCE
+[glance]
+api_servers=192.168.206.130:9292
+
 # DATABASE
 [database]
 connection=mysql://nova:yourpassword@192.168.206.130/nova
diff --git a/doc/common/samples/nova.conf-yum b/doc/common/samples/nova.conf-yum
index 495a89cd04..a791df62a1 100644
--- a/doc/common/samples/nova.conf-yum
+++ b/doc/common/samples/nova.conf-yum
@@ -34,7 +34,6 @@ qpid_hostname=192.168.206.130
 
 # GLANCE
 image_service=nova.image.glance.GlanceImageService
-glance_api_servers=192.168.206.130:9292
 
 # NETWORK
 network_manager=nova.network.manager.FlatDHCPManager
@@ -66,6 +65,10 @@ admin_user = nova
 admin_password = nova
 signing_dirname = /tmp/keystone-signing-nova
 
+# GLANCE
+[glance]
+api_servers=192.168.206.130:9292
+
 # DATABASE
 [database]
 connection=mysql://nova:yourpassword@192.168.206.130/nova
diff --git a/doc/config-reference/compute/section_hypervisor_hyper-v.xml b/doc/config-reference/compute/section_hypervisor_hyper-v.xml
index bf2c72c758..8629789c74 100644
--- a/doc/config-reference/compute/section_hypervisor_hyper-v.xml
+++ b/doc/config-reference/compute/section_hypervisor_hyper-v.xml
@@ -317,12 +317,13 @@ instances_path=e:\Hyper-V\instances
 policy_file=C:\Program Files (x86)\OpenStack\nova\etc\nova\policy.json
 api_paste_config=c:\openstack\nova\etc\nova\api-paste.ini
 rabbit_host=<replaceable>IP_ADDRESS</replaceable>
-glance_api_servers=<replaceable>IP_ADDRESS</replaceable>:9292
 image_service=nova.image.glance.GlanceImageService
 instances_shared_storage=false
 limit_cpu_features=true
 compute_driver=nova.virt.hyperv.driver.HyperVDriver
 volume_api_class=nova.volume.cinder.API
+[glance]
+api_servers=<replaceable>IP_ADDRESS</replaceable>:9292
 [database]
 connection=mysql://nova:passwd@<replaceable>IP_ADDRESS</replaceable>/nova</programlisting>
     <para><xref linkend="config_table_nova_hyperv"/> contains a reference of all
diff --git a/doc/install-guide/section_nova-compute-install.xml b/doc/install-guide/section_nova-compute-install.xml
index d1b9778d50..6f9ef17d3e 100644
--- a/doc/install-guide/section_nova-compute-install.xml
+++ b/doc/install-guide/section_nova-compute-install.xml
@@ -110,11 +110,11 @@ novncproxy_base_url = http://<replaceable>controller</replaceable>:6080/vnc_auto
           </note>
         </step>
         <step>
-          <para>In the <literal>[DEFAULT]</literal> section, configure the
+          <para>In the <literal>[glance]</literal> section, configure the
             location of the Image Service:</para>
-          <programlisting language="ini">[DEFAULT]
+          <programlisting language="ini">[glance]
 ...
-glance_host = <replaceable>controller</replaceable></programlisting>
+host = <replaceable>controller</replaceable></programlisting>
         </step>
       </substeps>
     </step>