x
/
fuel-ccp-horizon
Code Issues Proposed changes

Ports configuration refactoring 

Ports configuration has been changed:

before:

  port: 123:3333

after:

  port:
    cont: 123
    node: 3333

Change-Id: I5896a401a80826997f4bfd7218ae7ee4c3a14a16
Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150
This commit is contained in:
Andrey Pavlov 2016-10-19 18:03:02 +00:00
parent 17c0ee41d1
commit 5c9f58a38b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
service/files/defaults.yaml
View File

@ -1,6 +1,7 @@
configs:
horizon:
port: 80
port:
cont: 80
secret_key: secret
wsgi:

4
service/files/local_settings.j2
View File

@ -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.

2
service/files/openstack-dashboard.conf.j2
View File

@ -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 }}