From bdde470ba702fede800994885d7fc42b705cdc14 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <apavlov@mirantis.com>
Date: Wed, 26 Oct 2016 13:15:07 +0000
Subject: [PATCH] Ports configuration refactoring

Ports configuration has been changed:

before:

  port: 123:3333

after:

  port:
    cont: 123
    node: 3333

Change-Id: I97c91ce500718ececae68f060cf5a87b44d272f3
Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150
---
 service/cinder-api.yaml      |  6 +++---
 service/files/cinder.conf.j2 | 10 +++++-----
 service/files/defaults.yaml  |  3 ++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/service/cinder-api.yaml b/service/cinder-api.yaml
index 5db7ca4..3c3a6db 100644
--- a/service/cinder-api.yaml
+++ b/service/cinder-api.yaml
@@ -44,17 +44,17 @@ service:
           dependencies:
             - cinder-service-create
           type: single
-          command: openstack endpoint create --region RegionOne volumev2 public http://{{ address('cinder-api') }}:{{ cinder.api_port }}/v2/%\(tenant_id\)s
+          command: openstack endpoint create --region RegionOne volumev2 public http://{{ address('cinder-api') }}:{{ cinder.api_port.cont }}/v2/%\(tenant_id\)s
         - name: cinder-internal-endpoint-create
           dependencies:
             - cinder-service-create
           type: single
-          command: openstack endpoint create --region RegionOne volumev2 internal http://{{ address('cinder-api') }}:{{ cinder.api_port }}/v2/%\(tenant_id\)s
+          command: openstack endpoint create --region RegionOne volumev2 internal http://{{ address('cinder-api') }}:{{ cinder.api_port.cont }}/v2/%\(tenant_id\)s
         - name: cinder-admin-endpoint-create
           dependencies:
             - cinder-service-create
           type: single
-          command: openstack endpoint create --region RegionOne volumev2 admin http://{{ address('cinder-api') }}:{{ cinder.api_port }}/v2/%\(tenant_id\)s
+          command: openstack endpoint create --region RegionOne volumev2 admin http://{{ address('cinder-api') }}:{{ cinder.api_port.cont }}/v2/%\(tenant_id\)s
       daemon:
         command: cinder-api --config-file /etc/cinder/cinder.conf
         files:
diff --git a/service/files/cinder.conf.j2 b/service/files/cinder.conf.j2
index ac8b820..4725602 100644
--- a/service/files/cinder.conf.j2
+++ b/service/files/cinder.conf.j2
@@ -5,7 +5,7 @@ use_stderr = True
 
 volume_name_template = volume-%s
 
-glance_api_servers = {{ address('glance-api') }}:{{ glance.api_port }}
+glance_api_servers = {{ address('glance-api') }}:{{ glance.api_port.cont }}
 
 glance_num_retries = 3
 glance_api_version = 2
@@ -15,7 +15,7 @@ os_region_name = RegionOne
 enabled_backends = {{ cinder.enabled_backends }}
 
 osapi_volume_listen = {{ network_topology["private"]["address"] }}
-osapi_volume_listen_port = {{ cinder.api_port }}
+osapi_volume_listen_port = {{ cinder.api_port.cont }}
 
 api_paste_config = /etc/cinder/api-paste.ini
 nova_catalog_info = compute:nova:internalURL
@@ -30,15 +30,15 @@ max_retries = -1
 
 [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 = service
 username = {{ cinder.username }}
 password = {{ cinder.password }}
-memcached_servers = {{ address('memcached') }}:{{ memcached.port }}
+memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
 
 [oslo_concurrency]
 lock_path = /var/lib/cinder/tmp
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 72a77b2..8c5a727 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -1,6 +1,7 @@
 configs:
   cinder:
-    api_port: 8776
+    api_port:
+      cont: 8776
     debug: false
     username: "cinder"
     password: "password"