From 5ddc758384b7d4d4f64279d097f96b4e3cfff334 Mon Sep 17 00:00:00 2001
From: Matt Kassawara <mkassawara@gmail.com>
Date: Thu, 19 Dec 2013 12:12:49 -0700
Subject: [PATCH] Fixed 'openstack-config' commands in controller nova.conf

Corrected section from 'DEFAULT' to 'keystone_authtoken' for the
following keys: auth_host, admin_user, admin_tenant_name,
admin_password

Added commands for the following keys: auth_protocol, auth_port

Change-Id: I3f81e4055f50c32f9ccd941e2ae2d3e6fba25a19
Closes-Bug: #1261927
---
 doc/install-guide/section_nova-controller.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/install-guide/section_nova-controller.xml b/doc/install-guide/section_nova-controller.xml
index a06a7a13de..60a0463444 100644
--- a/doc/install-guide/section_nova-controller.xml
+++ b/doc/install-guide/section_nova-controller.xml
@@ -150,12 +150,13 @@ vncserver_proxyclient_address=192.168.0.10</programlisting>
       <para>Configure Compute to use these credentials with the Identity
         Service running on the controller. Replace
         <replaceable>NOVA_PASS</replaceable> with your Compute password.</para>
-      <!-- FIXME don't think this is necessary - now happens in api-paste.ini -->
       <screen os="fedora;rhel;centos;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT auth_strategy keystone</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT auth_host <replaceable>controller</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_user nova</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_tenant_name service</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_password <replaceable>NOVA_PASS</replaceable></userinput></screen>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf keystone_authtoken auth_host <replaceable>controller</replaceable></userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf keystone_authtoken auth_protocol http</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf keystone_authtoken auth_port 35357</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf keystone_authtoken admin_user nova</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf keystone_authtoken admin_tenant_name service</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf keystone_authtoken admin_password <replaceable>NOVA_PASS</replaceable></userinput></screen>
       <para os="ubuntu;debian">Edit the <literal>[DEFAULT]</literal> section
         in the <filename>/etc/nova/nova.conf</filename> file to add this
         key: