Convert all Horizon config to nested

Change-Id: Ic95b1c832a6c15727bee102cc2ac1954872fb59b
This commit is contained in:
Yuriy Taraday 2016-10-10 16:48:56 +03:00
parent fbbdc85169
commit 741baad875
4 changed files with 10 additions and 8 deletions

View File

@ -1,9 +1,11 @@
configs:
horizon_port: 80
horizon_secret_key: secret
horizon:
port: 80
secret_key: secret
horizon_wsgi_processes: 6
horizon_wsgi_threads: 15
wsgi:
processes: 6
threads: 15
sources:
openstack/horizon:

View File

@ -121,7 +121,7 @@ LOCAL_PATH = os.path.dirname(os.path.abspath(__file__))
# (usually behind a load-balancer). Either you have to make sure that a session
# gets all requests routed to the same dashboard instance or you set the same
# SECRET_KEY for all of them.
SECRET_KEY = "{{ horizon_secret_key }}"
SECRET_KEY = "{{ horizon.secret_key }}"
# We recommend you use memcached for development; otherwise after every reload
# of the django development server, you will have to login again. To use

View File

@ -1,9 +1,9 @@
{% set venv_path = '/var/lib/microservices/venv/lib/python2.7/site-packages' %}
<VirtualHost *:{{ horizon_port }}>
<VirtualHost *:{{ horizon.port }}>
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 }}
WSGIDaemonProcess horizon user=horizon group=horizon processes={{ horizon.wsgi.processes }} threads={{ horizon.wsgi.threads }} python-path={{ venv_path }}
WSGIProcessGroup horizon
Alias /static {{ venv_path }}/static

View File

@ -1,7 +1,7 @@
service:
name: horizon
ports:
- {{ horizon_port }}
- {{ horizon.port }}
containers:
- name: horizon
image: horizon