diff --git a/contrail/environment/modules/contrail/manifests/profile/openstack_controller.pp b/contrail/environment/modules/contrail/manifests/profile/openstack_controller.pp index a7e602f8..0e0a6267 100644 --- a/contrail/environment/modules/contrail/manifests/profile/openstack_controller.pp +++ b/contrail/environment/modules/contrail/manifests/profile/openstack_controller.pp @@ -47,7 +47,7 @@ group => root, content => template("${module_name}/local_settings.py.erb") } - if ($package_sku != 'kilo') { + if ($package_sku !~ /^*2015.1.*/) { package { 'contrail-openstack-dashboard': ensure => latest, } diff --git a/contrail/environment/modules/contrail/templates/local_settings.py.erb b/contrail/environment/modules/contrail/templates/local_settings.py.erb index 57c78636..4772ada5 100644 --- a/contrail/environment/modules/contrail/templates/local_settings.py.erb +++ b/contrail/environment/modules/contrail/templates/local_settings.py.erb @@ -658,6 +658,7 @@ ALLOWED_HOSTS = '*' COMPRESS_OFFLINE = True LOGOUT_URL='/horizon/auth/logout/' -<%- if @package_sku != 'kilo' -%> +##TODO: remove the check for kilo once we have package available +<%- if @package_sku !~ /^*2015.1.*/ -%> HORIZON_CONFIG['customization_module'] = 'contrail_openstack_dashboard.overrides' <%- end -%>