stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #383 from enovance/horizon-upstream

Browse Source 
dashboard: use puppet-horizon from upstream
This commit is contained in:
Sebastien Badia 2014-03-26 19:47:55 +01:00
commit 4c1d351917
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.fixtures.yml
View File

@ -14,7 +14,7 @@ fixtures:
ref: '001f1b6a8ef6bd0fde8fbe0a4b3362f31e6bbcda' ref: '001f1b6a8ef6bd0fde8fbe0a4b3362f31e6bbcda'
'horizon': 'horizon':
repo: 'git://github.com/enovance/puppet-horizon' repo: 'git://github.com/enovance/puppet-horizon'
ref: 'origin/backport_of_I39b52b2b_I813b5f60' ref: '20e8cfdb082edd938d957406ac85cabe227f0cbe'
'swift': 'swift':
repo: 'git://github.com/enovance/puppet-swift' repo: 'git://github.com/enovance/puppet-swift'
ref: '9b60581a1c8fd2c1a98adafc1bcdc53796859e23' ref: '9b60581a1c8fd2c1a98adafc1bcdc53796859e23'

3
Puppetfile
View File

@ -29,10 +29,9 @@ mod 'glance',
mod 'heat', mod 'heat',
:git => 'git://github.com/enovance/puppet-heat.git', :git => 'git://github.com/enovance/puppet-heat.git',
:ref => 'bdf094da21161ec6f78530775a0c41fc76fd3339' :ref => 'bdf094da21161ec6f78530775a0c41fc76fd3339'
#FIXME
mod 'horizon', mod 'horizon',
:git => 'git://github.com/enovance/puppet-horizon.git', :git => 'git://github.com/enovance/puppet-horizon.git',
:ref => 'backport_of_I39b52b2b_I813b5f60' :ref => '20e8cfdb082edd938d957406ac85cabe227f0cbe'
mod 'keystone', mod 'keystone',
:git => 'git://github.com/enovance/puppet-keystone.git', :git => 'git://github.com/enovance/puppet-keystone.git',
:ref => '9802add6566646dc1e4a2812d19c2ab4724ff594' :ref => '9802add6566646dc1e4a2812d19c2ab4724ff594'

3
manifests/dashboard.pp
View File

@ -111,7 +111,8 @@ class cloud::dashboard(
listen_ssl => $listen_ssl, listen_ssl => $listen_ssl,
horizon_cert => $horizon_cert, horizon_cert => $horizon_cert,
horizon_key => $horizon_key, horizon_key => $horizon_key,
horizon_ca => $horizon_ca horizon_ca => $horizon_ca,
vhost_extra_params => { 'add_listen' => false }
} }
if ($::osfamily == 'Debian') { if ($::osfamily == 'Debian') {

3
spec/classes/cloud_dashboard_spec.rb
View File

@ -47,7 +47,8 @@ describe 'cloud::dashboard' do
:cache_server_ip => false, :cache_server_ip => false,
:keystone_url => 'http://keystone.openstack.org:5000/v2.0', :keystone_url => 'http://keystone.openstack.org:5000/v2.0',
:django_debug => true, :django_debug => true,
:neutron_options => { 'enable_lb' => true } :neutron_options => { 'enable_lb' => true },
:vhost_extra_params => { 'add_listen' => false }
) )
end end
end end