endpoint token fix
Change-Id: Icaaeda5d74af9bbca0126466317a4395e3d6cfb8
diff --git a/README.rst b/README.rst
index 346fcf9..59f8a88 100644
--- a/README.rst
+++ b/README.rst
@@ -374,9 +374,11 @@
admin:
host: 10.0.0.2
port: 5000
- project: 'token'
+ project: admin
user: admin
password: 'passwd'
+ region_name: RegionOne
+ protocol: https
roles:
- admin
- member
@@ -413,27 +415,27 @@
.. code-block:: yaml
- keystone:
- client:
- enabled: true
- server:
- keystone01:
- admin:
- host: 10.0.0.2
- port: 5000
- project: 'admin'
- user: admin
- password: 'workshop'
- region_name: RegionOne
- protocol: https
- keystone02:
- admin:
- host: 10.0.0.3
- port: 5000
- project: 'admin'
- user: admin
- password: 'workshop'
- region_name: RegionOne
+ keystone:
+ client:
+ enabled: true
+ server:
+ keystone01:
+ admin:
+ host: 10.0.0.2
+ port: 5000
+ project: 'admin'
+ user: admin
+ password: 'workshop'
+ region_name: RegionOne
+ protocol: https
+ keystone02:
+ admin:
+ host: 10.0.0.3
+ port: 5000
+ project: 'admin'
+ user: admin
+ password: 'workshop'
+ region_name: RegionOne
Tenant quotas
@@ -448,9 +450,11 @@
admin:
host: 10.0.0.2
port: 5000
- project: 'token'
+ project: admin
user: admin
password: 'passwd'
+ region_name: RegionOne
+ protocol: https
roles:
- admin
- member
diff --git a/keystone/files/keystone.conf b/keystone/files/keystone.conf
index ecb18a0..e6c9de2 100644
--- a/keystone/files/keystone.conf
+++ b/keystone/files/keystone.conf
@@ -14,11 +14,18 @@
{%- endif %}
{%- if identity.admin.user is defined %}
+
+{%- if identity.admin.token is not defined %}
+
{{ profile_name }}:
keystone.user: '{{ identity.admin.user }}'
keystone.password: '{{ identity.admin.password }}'
keystone.tenant: '{{ identity.admin.project }}'
keystone.auth_url: '{{ protocol+'://'+identity.admin.host+':'+identity.admin.port|string+'/'+version }}'
keystone.region_name: '{{ identity.admin.region_name }}'
+
{%- endif %}
+
+{%- endif %}
+
{%- endfor %}