From f1910ea7b38e9f05662cba69e1369c277817b4fe Mon Sep 17 00:00:00 2001 From: Martin Horak Date: Fri, 30 Nov 2018 10:56:07 +0100 Subject: [PATCH] Support for Ubuntu bionic. --- nova/map.jinja | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nova/map.jinja b/nova/map.jinja index cfa4dc4..6251d47 100644 --- a/nova/map.jinja +++ b/nova/map.jinja @@ -18,7 +18,11 @@ } %} {%- if salt['grains.get']('os_family') == 'Debian' %} +{%- if salt['grains.get']('osmajorrelease') >= 18 %} +{%- set pkgs_list = [ 'nova-common', 'nova-novncproxy', 'nova-ajax-console-proxy', 'nova-spiceproxy', 'nova-xvpvncproxy', 'novnc', 'nova-api', 'nova-conductor', 'nova-consoleauth', 'nova-doc', 'nova-scheduler', 'python-novaclient', 'python-memcache', 'gettext-base', 'python-pycadf'] %} +{%- else %} {%- set pkgs_list = [ 'nova-common', 'nova-consoleproxy', 'novnc', 'nova-api', 'nova-conductor', 'nova-consoleauth', 'nova-doc', 'nova-scheduler', 'python-novaclient', 'python-memcache', 'gettext-base', 'python-pycadf'] %} +{%- endif %} {%- set services_list = ['nova-conductor', 'nova-api', 'nova-consoleauth', 'nova-scheduler', 'nova-novncproxy'] %} {%- if pillar.nova.controller is defined and pillar.nova.controller.get('version',{}) in ["juno", "kilo", "liberty", "mitaka"] %} {%- do pkgs_list.append('nova-cert') %}