Revert "spice-html5: hack to enable secure console"

This is fixed in edeploy roles:
dede76c397

This reverts commit 1a3518050a.
This commit is contained in:
Emilien Macchi
2014-09-09 13:14:41 -04:00
parent 0469399318
commit b353609c56
2 changed files with 2 additions and 30 deletions

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,