Merge "Adjust urls with new 'address' functionality"
This commit is contained in:
commit
a6916421f8
|
@ -17,26 +17,26 @@ rabbit_hosts = rabbitmq
|
||||||
|
|
||||||
[keystone_authtoken]
|
[keystone_authtoken]
|
||||||
auth_version = v3
|
auth_version = v3
|
||||||
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}/v3
|
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
|
||||||
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}/v3
|
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3
|
||||||
auth_type = password
|
auth_type = password
|
||||||
project_domain_id = default
|
project_domain_id = default
|
||||||
user_domain_id = default
|
user_domain_id = default
|
||||||
project_name = {{ openstack.project_name }}
|
project_name = {{ openstack.project_name }}
|
||||||
username = {{ heat.user }}
|
username = {{ heat.user }}
|
||||||
password = {{ heat.password }}
|
password = {{ heat.password }}
|
||||||
memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
|
memcached_servers = {{ address('memcached', memcached.port) }}
|
||||||
|
|
||||||
[trustee]
|
[trustee]
|
||||||
user_domain_id = default
|
user_domain_id = default
|
||||||
password = {{ heat.password }}
|
password = {{ heat.password }}
|
||||||
username = {{ heat.user }}
|
username = {{ heat.user }}
|
||||||
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
|
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
|
||||||
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
|
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
|
||||||
auth_type = password
|
auth_type = password
|
||||||
|
|
||||||
[clients_keystone]
|
[clients_keystone]
|
||||||
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
|
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
|
||||||
|
|
||||||
[heat_api]
|
[heat_api]
|
||||||
bind_host = {{ network_topology["private"]["address"] }}
|
bind_host = {{ network_topology["private"]["address"] }}
|
||||||
|
@ -45,4 +45,4 @@ bind_port = {{ heat.api_port.cont }}
|
||||||
[cache]
|
[cache]
|
||||||
backend = oslo_cache.memcache_pool
|
backend = oslo_cache.memcache_pool
|
||||||
enabled = True
|
enabled = True
|
||||||
memcache_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
|
memcache_servers = {{ address('memcached', memcached.port) }}
|
||||||
|
|
|
@ -55,13 +55,13 @@ service:
|
||||||
- heat-service-create
|
- heat-service-create
|
||||||
type: single
|
type: single
|
||||||
command:
|
command:
|
||||||
openstack endpoint create --region RegionOne orchestration internal http://{{ address('heat-api') }}:{{ heat.api_port.cont }}/v1/%\(tenant_id\)s
|
openstack endpoint create --region RegionOne orchestration internal {{ address('heat-api', heat.api_port, with_scheme=True) }}/v1/%\(tenant_id\)s
|
||||||
- name: heat-admin-endpoint-create
|
- name: heat-admin-endpoint-create
|
||||||
dependencies:
|
dependencies:
|
||||||
- heat-service-create
|
- heat-service-create
|
||||||
type: single
|
type: single
|
||||||
command:
|
command:
|
||||||
openstack endpoint create --region RegionOne orchestration admin http://{{ address('heat-api') }}:{{ heat.api_port.cont }}/v1/%\(tenant_id\)s
|
openstack endpoint create --region RegionOne orchestration admin {{ address('heat-api', heat.api_port, with_scheme=True) }}/v1/%\(tenant_id\)s
|
||||||
daemon:
|
daemon:
|
||||||
dependencies:
|
dependencies:
|
||||||
- rabbitmq
|
- rabbitmq
|
||||||
|
|
Loading…
Reference in New Issue