Ports configuration refactoring

Ports configuration has been changed:

before:

  port: 123:3333

after:

  port:
    cont: 123
    node: 3333

Change-Id: I4a2327802839641ea44c5fc858287706d45ee5b6
Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150
This commit is contained in:
Andrey Pavlov 2016-10-19 18:40:15 +00:00
parent 4b296c080a
commit 00d4f259e4
3 changed files with 13 additions and 12 deletions

View File

@ -1,6 +1,7 @@
configs:
heat:
api_port: 8004
api_port:
cont: 8004
db:
username: heat

View File

@ -17,32 +17,32 @@ rabbit_hosts = rabbitmq
[keystone_authtoken]
auth_version = v3
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}/v3
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port }}/v3
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}/v3
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}/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 }}
memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
[trustee]
user_domain_id = default
password = {{ heat.password }}
username = {{ heat.user }}
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port }}
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
auth_type = password
[clients_keystone]
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
[heat_api]
bind_host = {{ network_topology["private"]["address"] }}
bind_port = {{ heat.api_port }}
bind_port = {{ heat.api_port.cont }}
[cache]
backend = oslo_cache.memcache_pool
enabled = True
memcache_servers = {{ address('memcached') }}:{{ memcached.port }}
memcache_servers = {{ address('memcached') }}:{{ memcached.port.cont }}

View File

@ -49,19 +49,19 @@ service:
- heat-service-create
type: single
command:
openstack endpoint create --region RegionOne orchestration public http://{{ address('heat-api') }}:{{ heat.api_port }}/v1/%\(tenant_id\)s
openstack endpoint create --region RegionOne orchestration public http://{{ address('heat-api') }}:{{ heat.api_port.cont }}/v1/%\(tenant_id\)s
- name: heat-internal-endpoint-create
dependencies:
- heat-service-create
type: single
command:
openstack endpoint create --region RegionOne orchestration internal http://{{ address('heat-api') }}:{{ heat.api_port }}/v1/%\(tenant_id\)s
openstack endpoint create --region RegionOne orchestration internal http://{{ address('heat-api') }}:{{ heat.api_port.cont }}/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 }}/v1/%\(tenant_id\)s
openstack endpoint create --region RegionOne orchestration admin http://{{ address('heat-api') }}:{{ heat.api_port.cont }}/v1/%\(tenant_id\)s
daemon:
dependencies:
- rabbitmq