stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #607 from enovance/revert-spice

Browse Source 
Revert "spice-html5: hack to enable secure console"
This commit is contained in:
Yanis Guenane 2014-09-09 15:13:23 -04:00
commit dba01efab3
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/compute/consoleproxy.pp
View File

@ -15,15 +15,10 @@
#
# Compute Proxy Console node
#
# [*secure*]
# (optionnal) Enabled or not WSS in spice-html5 code
# Defaults to false.
#
class cloud::compute::consoleproxy(
$api_eth = '127.0.0.1',
$spice_port = '6082',
$secure = false,
$spice_port = '6082'
){
include 'cloud::compute'
@ -33,15 +28,6 @@ class cloud::compute::consoleproxy(
host => $api_eth
}
# Horrible Hack to allow spice-html5 to connect on the web service
# by SSL. Since "ws" is hardcoded, there is no way to use HTTPS otherwise.
if $secure {
exec { 'enable_wss_spice_html5':
command => '/bin/sed -i "s/ws:\/\//wss:\/\//g" /usr/share/spice-html5/spice_auto.html',
unless => '/bin/grep -F "wss://" /usr/share/spice-html5/spice_auto.html',
}
}
@@haproxy::balancermember{"${::fqdn}-compute_spice":
listening_service => 'spice_cluster',
server_names => $::hostname,

16
spec/classes/cloud_compute_consoleproxy_spec.rb
View File

@ -45,8 +45,7 @@ describe 'cloud::compute::consoleproxy' do
let :params do
{ :api_eth => '10.0.0.1',
:spice_port => '6082',
:secure => false }
:spice_port => '6082' }
end
it 'configure nova common' do
@ -95,19 +94,6 @@ describe 'cloud::compute::consoleproxy' do
)
end
context 'when using secure console' do
before :each do
params.merge!( :secure => true )
end
it 'replace ws by wss in spice html5 code' do
should contain_exec('enable_wss_spice_html5').with(
:command => '/bin/sed -i "s/ws:\/\//wss:\/\//g" /usr/share/spice-html5/spice_auto.html',
:unless => '/bin/grep -F "wss://" /usr/share/spice-html5/spice_auto.html'
)
end
end
end
context 'on Debian platforms' do