diff --git a/.fixtures.yml b/.fixtures.yml index 2ca6a26f..97443ff9 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -14,7 +14,7 @@ fixtures: ref: '001f1b6a8ef6bd0fde8fbe0a4b3362f31e6bbcda' 'horizon': repo: 'git://github.com/enovance/puppet-horizon' - ref: 'origin/backport_of_I39b52b2b_I813b5f60' + ref: '20e8cfdb082edd938d957406ac85cabe227f0cbe' 'swift': repo: 'git://github.com/enovance/puppet-swift' ref: '9b60581a1c8fd2c1a98adafc1bcdc53796859e23' diff --git a/Puppetfile b/Puppetfile index 9ea2e3ca..e6783ef6 100644 --- a/Puppetfile +++ b/Puppetfile @@ -29,10 +29,9 @@ mod 'glance', mod 'heat', :git => 'git://github.com/enovance/puppet-heat.git', :ref => 'bdf094da21161ec6f78530775a0c41fc76fd3339' -#FIXME mod 'horizon', :git => 'git://github.com/enovance/puppet-horizon.git', - :ref => 'backport_of_I39b52b2b_I813b5f60' + :ref => '20e8cfdb082edd938d957406ac85cabe227f0cbe' mod 'keystone', :git => 'git://github.com/enovance/puppet-keystone.git', :ref => '9802add6566646dc1e4a2812d19c2ab4724ff594' diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 7d71b508..20b225b8 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -111,7 +111,8 @@ class cloud::dashboard( listen_ssl => $listen_ssl, horizon_cert => $horizon_cert, horizon_key => $horizon_key, - horizon_ca => $horizon_ca + horizon_ca => $horizon_ca, + vhost_extra_params => { 'add_listen' => false } } if ($::osfamily == 'Debian') { diff --git a/spec/classes/cloud_dashboard_spec.rb b/spec/classes/cloud_dashboard_spec.rb index 08c3f6cb..f21d549e 100644 --- a/spec/classes/cloud_dashboard_spec.rb +++ b/spec/classes/cloud_dashboard_spec.rb @@ -47,7 +47,8 @@ describe 'cloud::dashboard' do :cache_server_ip => false, :keystone_url => 'http://keystone.openstack.org:5000/v2.0', :django_debug => true, - :neutron_options => { 'enable_lb' => true } + :neutron_options => { 'enable_lb' => true }, + :vhost_extra_params => { 'add_listen' => false } ) end end