From 8fc335b97e0568e3b56971f5692df33a50448c5e Mon Sep 17 00:00:00 2001 From: Dheeraj Gautam Date: Tue, 26 Jan 2016 08:53:21 -0800 Subject: [PATCH] SM-KILO: updated code to use version Closes-Bug: #1527720 CHANGES: 1. updated code to check against version number instead of release code name. TESTING: 1. verified local_setting.py has code ommision for kilo 2. verified contrail-dashboard package got installed for juno but not for kilo. Change-Id: I8f1e226088a40317dda1a1a506a6e7021dcc2bbb --- .../modules/contrail/manifests/profile/openstack_controller.pp | 2 +- .../modules/contrail/templates/local_settings.py.erb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 -%>