From 498148900b1338f821f7b13df7eaa987b84b7251 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Wed, 15 Oct 2014 11:45:56 +0200
Subject: [PATCH] Add missing region to keystone endpoints

Change-Id: Ic72ed9f32f57a544cae5842656883af0711fd09d
---
 .../object-storage/section_object-storage-install.xml          | 3 ++-
 doc/install-guide/section_ceilometer-controller.xml            | 3 ++-
 doc/install-guide/section_sahara-install.xml                   | 3 ++-
 doc/install-guide/section_trove-install.xml                    | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/install-guide/object-storage/section_object-storage-install.xml b/doc/install-guide/object-storage/section_object-storage-install.xml
index f5f70c5ed3..3e9e0d0c86 100644
--- a/doc/install-guide/object-storage/section_object-storage-install.xml
+++ b/doc/install-guide/object-storage/section_object-storage-install.xml
@@ -94,7 +94,8 @@
   --service-id $(keystone service-list | awk '/ object-store / {print $2}') \
   --publicurl 'http://<replaceable>controller</replaceable>:8080/v1/AUTH_%(tenant_id)s' \
   --internalurl 'http://<replaceable>controller</replaceable>:8080/v1/AUTH_%(tenant_id)s' \
-  --adminurl http://<replaceable>controller</replaceable>:8080</userinput>
+  --adminurl http://<replaceable>controller</replaceable>:8080 \
+  -region regionOne</userinput>
 <computeroutput>+-------------+---------------------------------------------------+
 |   Property  |                       Value                       |
 +-------------+---------------------------------------------------+
diff --git a/doc/install-guide/section_ceilometer-controller.xml b/doc/install-guide/section_ceilometer-controller.xml
index 4139230257..d0c85222b1 100644
--- a/doc/install-guide/section_ceilometer-controller.xml
+++ b/doc/install-guide/section_ceilometer-controller.xml
@@ -107,7 +107,8 @@
   --service-id $(keystone service-list | awk '/ metering / {print $2}') \
   --publicurl http://<replaceable>controller</replaceable>:8777 \
   --internalurl http://<replaceable>controller</replaceable>:8777 \
-  --adminurl http://<replaceable>controller</replaceable>:8777</userinput></screen>
+  --adminurl http://<replaceable>controller</replaceable>:8777</userinput> \
+  --region regionOne</screen>
         </step>
       </substeps>
     </step>
diff --git a/doc/install-guide/section_sahara-install.xml b/doc/install-guide/section_sahara-install.xml
index 707b014e86..a1f88f11ad 100644
--- a/doc/install-guide/section_sahara-install.xml
+++ b/doc/install-guide/section_sahara-install.xml
@@ -82,7 +82,8 @@ max_allowed_packet = 256M</programlisting>
   --service-id $(keystone service-list | awk '/ sahara / {print $2}') \
   --publicurl http://<replaceable>controller</replaceable>:8386/v1.1/%\(tenant_id\)s \
   --internalurl http://<replaceable>controller</replaceable>:8386/v1.1/%\(tenant_id\)s \
-  --adminurl http://<replaceable>controller</replaceable>:8386/v1.1/%\(tenant_id\)s</userinput></screen>
+  --adminurl http://<replaceable>controller</replaceable>:8386/v1.1/%\(tenant_id\)s \
+  --region regionOne</userinput></screen>
     </para></step>
     <step><para>Start the sahara service:
       <screen os="rhel;centos;fedora;opensuse;ubuntu;debian"><prompt>#</prompt> <userinput>systemctl start openstack-sahara-all</userinput></screen>
diff --git a/doc/install-guide/section_trove-install.xml b/doc/install-guide/section_trove-install.xml
index 4ff84a91d4..ea6e37f856 100644
--- a/doc/install-guide/section_trove-install.xml
+++ b/doc/install-guide/section_trove-install.xml
@@ -212,7 +212,8 @@ trove_auth_url = http://<replaceable>controller</replaceable>:35357/v2.0</progra
   --service-id $(keystone service-list | awk '/ trove / {print $2}') \
   --publicurl http://<replaceable>controller</replaceable>:8779/v1.0/%\(tenant_id\)s \
   --internalurl http://<replaceable>controller</replaceable>:8779/v1.0/%\(tenant_id\)s \
-  --adminurl http://<replaceable>controller</replaceable>:8779/v1.0/%\(tenant_id\)s</userinput></screen>
+  --adminurl http://<replaceable>controller</replaceable>:8779/v1.0/%\(tenant_id\)s \
+  --region regionOne</userinput></screen>
     </step>
 
     <step os="rhel;centos;fedora;opensuse;sles;ubuntu">