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

Ports configuration has been changed:

before:

  port: 123:3333

after:

  port:
    cont: 123
    node: 3333

Change-Id: I244ec96baba5705e80a84430ded868333944d066
Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150
---
 service/files/ceph.conf.j2  | 4 ++--
 service/files/defaults.yaml | 3 ++-
 service/radosgw.yaml        | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/service/files/ceph.conf.j2 b/service/files/ceph.conf.j2
index 8fc77a5..d535c32 100644
--- a/service/files/ceph.conf.j2
+++ b/service/files/ceph.conf.j2
@@ -11,12 +11,12 @@ keyring = /var/lib/ceph/radosgw/ceph-rgw/keyring
 rgw socket path = /tmp/radosgw.sock
 log file = /var/log/ceph/ceph-rgw-{{ namespace }}.log
 rgw data = /var/lib/ceph/radosgw/ceph-rgw
-rgw frontends = civetweb port={{ radosgw.port }} num_threads=50
+rgw frontends = civetweb port={{ radosgw.port.cont }} num_threads=50
 
 rgw keystone api version = 3
 rgw keystone admin domain = default
 rgw keystone admin project = admin
-rgw keystone url = http://{{ address('keystone') }}:{{ keystone.admin_port }}
+rgw keystone url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
 rgw keystone accepted roles = Member, _member_, admin
 rgw keystone revocation interval = 900
 rgw s3 auth use keystone = true
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index c9529b1..ff4d3aa 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -3,5 +3,6 @@ configs:
     fsid: "Changeme"
     mon_host: "Changeme"
   radosgw:
-    port: 7480
+    port:
+      cont: 7480
     key: "Changeme"
diff --git a/service/radosgw.yaml b/service/radosgw.yaml
index 6c187a2..f2354a6 100644
--- a/service/radosgw.yaml
+++ b/service/radosgw.yaml
@@ -17,19 +17,19 @@ service:
         - name: radosgw-create-swift-public-endpoint
           type: single
           command: openstack endpoint create --region RegionOne swift public
-                   "http://{{ address('radosgw') }}:{{ radosgw.port }}/swift/v1"
+                   "http://{{ address('radosgw') }}:{{ radosgw.port.cont }}/swift/v1"
           dependencies:
             - radosgw-create-swift-service
         - name: radosgw-create-swift-admin-endpoint
           type: single
           command: openstack endpoint create --region RegionOne swift admin
-                   "http://{{ address('radosgw') }}:{{ radosgw.port }}/swift/v1"
+                   "http://{{ address('radosgw') }}:{{ radosgw.port.cont }}/swift/v1"
           dependencies:
             - radosgw-create-swift-service
         - name: radosgw-create-swift-internal-endpoint
           type: single
           command: openstack endpoint create --region RegionOne swift internal
-                   "http://{{ address('radosgw') }}:{{ radosgw.port }}/swift/v1"
+                   "http://{{ address('radosgw') }}:{{ radosgw.port.cont }}/swift/v1"
           dependencies:
             - radosgw-create-swift-service
       daemon: