Merge "SM-KILO: updated code to use version"

Juniper · Jan 26, 2016 · 8b802c9 · 8b802c9
2 parents 631086b + 8fc335b
commit 8b802c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 -%>