summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-22 09:59:13 +0000
committerGerrit Code Review <review@openstack.org>2016-11-22 09:59:14 +0000
commitb4be289d02eb902a5f11adc5ddd4d0c7019583ae (patch)
tree5ec7b75fa74bb37289b5957c4fcd9ca530757970
parentaeaa13f05dcdca3cf7a94d152f08271718c68709 (diff)
parent291be02668021f10a448aafceb36e51813023f2a (diff)
Merge "Adjust urls with new 'address' functionality"
-rw-r--r--service/keystone.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/service/keystone.yaml b/service/keystone.yaml
index 7a2379d..d6ad761 100644
--- a/service/keystone.yaml
+++ b/service/keystone.yaml
@@ -46,9 +46,9 @@ service:
46 --bootstrap-project-name {{ openstack.project_name }} 46 --bootstrap-project-name {{ openstack.project_name }}
47 --bootstrap-role-name {{ openstack.role_name }} 47 --bootstrap-role-name {{ openstack.role_name }}
48 --bootstrap-service-name keystone --bootstrap-region-id RegionOne 48 --bootstrap-service-name keystone --bootstrap-region-id RegionOne
49 --bootstrap-admin-url http://{{ address('keystone') }}:{{ keystone.admin_port.cont }} 49 --bootstrap-admin-url {{ address('keystone', keystone.admin_port, with_scheme=True) }}
50 --bootstrap-public-url {{ address('keystone', keystone.public_port, external=True, with_scheme=True) }} 50 --bootstrap-public-url {{ address('keystone', keystone.public_port, external=True, with_scheme=True) }}
51 --bootstrap-internal-url http://{{ address('keystone') }}:{{ keystone.public_port.cont }} 51 --bootstrap-internal-url {{ address('keystone', keystone.public_port, with_scheme=True) }}
52 daemon: 52 daemon:
53 dependencies: 53 dependencies:
54 - memcached 54 - memcached