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

Ports configuration has been changed:

before:

  port: 123:3333

after:

  port:
    cont: 123
    node: 3333

Change-Id: I5896a401a80826997f4bfd7218ae7ee4c3a14a16
Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150
---
 service/files/defaults.yaml               | 3 ++-
 service/files/local_settings.j2           | 4 ++--
 service/files/openstack-dashboard.conf.j2 | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 98e089a..da98959 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -1,6 +1,7 @@
 configs:
   horizon:
-    port: 80
+    port:
+      cont: 80
     secret_key: secret
 
     wsgi:
diff --git a/service/files/local_settings.j2 b/service/files/local_settings.j2
index 998c975..6c9e9a8 100644
--- a/service/files/local_settings.j2
+++ b/service/files/local_settings.j2
@@ -129,7 +129,7 @@ SECRET_KEY = "{{ horizon.secret_key }}"
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': '{{ address("memcached") }}:{{ memcached.port }}',
+        'LOCATION': '{{ address("memcached") }}:{{ memcached.port.cont }}',
     },
 }
 
@@ -151,7 +151,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 #]
 
 OPENSTACK_HOST = "{{ address('keystone') }}"
-OPENSTACK_KEYSTONE_URL = "http://%s:{{ keystone.public_port }}/v3" % OPENSTACK_HOST
+OPENSTACK_KEYSTONE_URL = "http://%s:{{ keystone.public_port.cont }}/v3" % OPENSTACK_HOST
 OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_"
 
 # Enables keystone web single-sign-on if set to True.
diff --git a/service/files/openstack-dashboard.conf.j2 b/service/files/openstack-dashboard.conf.j2
index 63e4937..1f0bb78 100644
--- a/service/files/openstack-dashboard.conf.j2
+++ b/service/files/openstack-dashboard.conf.j2
@@ -1,6 +1,6 @@
 {% set venv_path = '/var/lib/microservices/venv/lib/python2.7/site-packages' %}
 
-<VirtualHost *:{{ horizon.port }}>
+<VirtualHost *:{{ horizon.port.cont }}>
     WSGIScriptAlias / {{ venv_path }}/openstack_dashboard/wsgi/django.wsgi
     WSGIScriptAlias /horizon {{ venv_path }}/openstack_dashboard/wsgi/django.wsgi
     WSGIDaemonProcess horizon user=horizon group=horizon processes={{ horizon.wsgi.processes }} threads={{ horizon.wsgi.threads }} python-path={{ venv_path }}