From 5ff6b14402b844ea67cd4ac0ac6d9dd3b1e9e0fe Mon Sep 17 00:00:00 2001 From: Ondrej Smola Date: Mon, 21 Nov 2016 13:59:50 +0100 Subject: [PATCH] Added parameter for horizon package Change-Id: I589115b279f54e59f35ce1f68bedf620a9727eb6 --- horizon/map.jinja | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/horizon/map.jinja b/horizon/map.jinja index 761f378..1a67d3f 100644 --- a/horizon/map.jinja +++ b/horizon/map.jinja @@ -1,11 +1,13 @@ +{%- set dashboard_package = salt['pillar.get']('horizon:server:package', 'openstack-dashboard') %} + {% set server = salt['grains.filter_by']({ 'Debian': { - 'pkgs': ['apache2', 'openstack-dashboard', 'python-lesscpy', 'python-memcache', 'gettext-base'], + 'pkgs': ['apache2', dashboard_package, 'python-lesscpy', 'python-memcache', 'gettext-base'], 'pkgs_multi': ['python-memcache', 'python-psycopg2', 'python-imaging', 'python-docutils', 'python-simplejson', 'build-essential', 'libxslt1-dev', 'libxml2-dev', 'libffi-dev', 'libssl-dev', 'gettext', 'python-lesscpy'], - 'ssl_pkgs': ['openstack-dashboard'], + 'ssl_pkgs': [dashboard_package], 'service': 'apache2', 'config': '/etc/openstack-dashboard/local_settings.py', 'apache_config': '/etc/apache2/conf-available/openstack-dashboard.conf', @@ -16,7 +18,7 @@ 'cache': {'host': '127.0.0.1', 'port': 11211} }, 'RedHat': { - 'pkgs': ['httpd', 'openstack-dashboard', 'python-lesscpy', 'python-memcached'], + 'pkgs': ['httpd', dashboard_package, 'python-lesscpy', 'python-memcached'], 'pkgs_multi': ['python-memcached', 'python-psycopg2', 'python-pillow', 'python-docutils', 'python-simplejson', 'libxslt-devel', 'gcc', 'libxml2-devel', 'libffi-devel', 'openssl-devel',