From e8ab4551826ce5a7e3ea56ee0006a9db40f49f5a Mon Sep 17 00:00:00 2001
From: zhubingbing <zhu.bingbing@99cloud.net>
Date: Sun, 16 Apr 2017 13:35:31 +0800
Subject: [PATCH] Update multi-regions.rst
Add ceilometer heat multi-regions content in multi-regions.rst
Change-Id: I9bc3d2a3ff25cee2d5e6d5318cffe6d65e4220b6
---
doc/multi-regions.rst | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/doc/multi-regions.rst b/doc/multi-regions.rst
index 6afbe7b3c0..045f657f68 100644
--- a/doc/multi-regions.rst
+++ b/doc/multi-regions.rst
@@ -67,8 +67,8 @@ the value of ``kolla_internal_fqdn`` in RegionOne:
kolla_internal_fqdn_r1: 10.10.10.254
- keystone_admin_url: "{{ admin_protocol }}://{{ kolla_internal_fqdn_r1 }}:{{ keystone_admin_port }}/v3"
- keystone_internal_url: "{{ internal_protocol }}://{{ kolla_internal_fqdn_r1 }}:{{ keystone_public_port }}/v3"
+ keystone_admin_url: "{{ admin_protocol }}://{{ kolla_internal_fqdn_r1 }}:{{ keystone_admin_port }}"
+ keystone_internal_url: "{{ internal_protocol }}://{{ kolla_internal_fqdn_r1 }}:{{ keystone_public_port }}"
openstack_auth:
auth_url: "{{ admin_protocol }}://{{ kolla_internal_fqdn_r1 }}:{{ keystone_admin_port }}"
@@ -76,7 +76,7 @@ the value of ``kolla_internal_fqdn`` in RegionOne:
password: "{{ keystone_admin_password }}"
project_name: "admin"
-Configuration files of nova/neutron/glance... have to be updated to
+Configuration files of cinder,nova,neutron,glance... have to be updated to
contact RegionOne's Keystone. Fortunately, Kolla offers to override all
configuration files at the same time thanks to the
``node_custom_config`` variable (see :ref:`service-config`). This
@@ -97,6 +97,29 @@ directory, a ``nova.conf`` file with below content:
[placement]
auth_url = {{ keystone_admin_url }}
+The Heat section inside the configuration file also
+has to be updated to contact RegionOne's Keystone. So create, in the same
+directory, a ``heat.conf`` file with below content:
+
+::
+ [trustee]
+ auth_uri = {{ keystone_internal_url }}
+ auth_url = {{ keystone_internal_url }}
+
+ [ec2authtoken]
+ auth_uri = {{ keystone_internal_url }}
+
+ [clients_keystone]
+ auth_uri = {{ keystone_internal_url }}
+
+The Ceilometer section inside the configuration file also
+has to be updated to contact RegionOne's Keystone. So create, in the same
+directory, a ``ceilometer.conf`` file with below content:
+
+::
+ [service_credentials]
+ auth_url = {{ keystone_internal_url }}
+
And link the directory that contains these files into the
``/etc/kolla/globals.yml``: