openstack
/
fuel-library
Code Issues Proposed changes

Disable horizon collectstatic for UCA packages 

There are hooks in openstack-dashboard form Ubuntu Cloud Archive
which take care of collecstatic. It is not needed for UCA deployment.

Change-Id: I14ce86021abc7fb2d1fee0995443d120c08c02cb
Closes-Bug: #1569373
This commit is contained in:
Matthew Mosesohn 2016-05-13 15:53:46 +04:00
parent d020f2acab
commit a9aca76205
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deployment/puppet/openstack_tasks/manifests/horizon/horizon.pp
View File

@ -15,6 +15,8 @@ class openstack_tasks::horizon::horizon {
$overview_days_range = pick($horizon_hash['overview_days_range'], 1)
$external_lb = hiera('external_lb', false)
$repo_setup = hiera_hash('repo_setup', {})
$repo_type = pick_default($repo_setup['repo_type'], '')
if $horizon_hash['secret_key'] {
$secret_key = $horizon_hash['secret_key']
@ -111,8 +113,10 @@ class openstack_tasks::horizon::horizon {
api_versions => {'identity' => 3},
}
# Always run collectstatic&compress for MOS/UCA packages
Concat[$::horizon::params::config_file] ~> Exec['refresh_horizon_django_cache']
# Only run collectstatic&compress for MOS packages
if $repo_type != 'uca' {
Concat[$::horizon::params::config_file] ~> Exec['refresh_horizon_django_cache']
}
# Performance optimization for wsgi
if ($::memorysize_mb < 1200 or $::processorcount <= 3) {
@ -169,3 +173,4 @@ class openstack_tasks::horizon::horizon {
}
}