From 00d4f259e40e7b724205945090071941872640af Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <apavlov@mirantis.com>
Date: Wed, 19 Oct 2016 18:40:15 +0000
Subject: [PATCH] Ports configuration refactoring

Ports configuration has been changed:

before:

  port: 123:3333

after:

  port:
    cont: 123
    node: 3333

Change-Id: I4a2327802839641ea44c5fc858287706d45ee5b6
Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150
---
 service/files/defaults.yaml |  3 ++-
 service/files/heat.conf.j2  | 16 ++++++++--------
 service/heat-api.yaml       |  6 +++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 43e8a03..4ad0466 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -1,6 +1,7 @@
 configs:
   heat:
-    api_port: 8004
+    api_port:
+      cont: 8004
 
     db:
       username: heat
diff --git a/service/files/heat.conf.j2 b/service/files/heat.conf.j2
index 08dca1b..206b7ed 100644
--- a/service/files/heat.conf.j2
+++ b/service/files/heat.conf.j2
@@ -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 }}
diff --git a/service/heat-api.yaml b/service/heat-api.yaml
index d3c357c..5fb34bc 100644
--- a/service/heat-api.yaml
+++ b/service/heat-api.yaml
@@ -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