x
/
fuel-ccp-heat
Code Issues Proposed changes

Merge "Adjust urls with new 'address' functionality"

This commit is contained in:
Jenkins 2016-11-22 08:52:48 +00:00 committed by Gerrit Code Review
parent 2881d04d99 4c21832458
commit a6916421f8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
service/files/heat.conf.j2
View File

@ -17,26 +17,26 @@ rabbit_hosts = rabbitmq
[keystone_authtoken]
auth_version = v3
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}/v3
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}/v3
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = {{ openstack.project_name }}
username = {{ heat.user }}
password = {{ heat.password }}
memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
memcached_servers = {{ address('memcached', memcached.port) }}
[trustee]
user_domain_id = default
password = {{ heat.password }}
username = {{ heat.user }}
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
auth_type = password
[clients_keystone]
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
[heat_api]
bind_host = {{ network_topology["private"]["address"] }}
@ -45,4 +45,4 @@ bind_port = {{ heat.api_port.cont }}
[cache]
backend = oslo_cache.memcache_pool
enabled = True
memcache_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
memcache_servers = {{ address('memcached', memcached.port) }}

4
service/heat-api.yaml
View File

@ -55,13 +55,13 @@ service:
- heat-service-create
type: single
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
dependencies:
- heat-service-create
type: single
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:
dependencies:
- rabbitmq