stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge "compute/hypervisor: refactorize console management"

Browse Source
This commit is contained in:
Jenkins 2014-12-16 15:27:16 +00:00 committed by Gerrit Code Review
commit a1924ec52f
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/compute/hypervisor.pp
View File

@ -20,7 +20,7 @@
# === Parameters:
#
# [*server_proxyclient_address*]
# (optional) Hostname or IP used to connect to Spice service.
# (optional) The IP address of the server running the console proxy client
# Defaults to '127.0.0.1'
#
# [*libvirt_type*]
@ -238,38 +238,32 @@ Host *
case $console {
'spice': {
class { 'nova::compute':
enabled => true,
vnc_enabled => false,
virtio_nic => false,
neutron_enabled => true
}
$vnc_enabled = false
class { 'nova::compute::spice':
server_listen => '0.0.0.0',
server_proxyclient_address => $server_proxyclient_address,
proxy_host => $ks_console_public_host,
proxy_protocol => $ks_console_public_proto,
proxy_port => $spice_port
proxy_port => $spice_port,
}
}
'novnc': {
class { 'nova::compute':
enabled => true,
vnc_enabled => true,
vncserver_proxyclient_address => $server_proxyclient_address,
vncproxy_host => $ks_console_public_host,
vncproxy_protocol => $ks_console_public_proto,
vncproxy_port => $novnc_port,
virtio_nic => false,
neutron_enabled => true
}
$vnc_enabled = true
}
default: {
fail("upported console type ${console}")
fail("unsupported console type ${console}")
}
}
class { 'nova::compute':
enabled => true,
vnc_enabled => $vnc_enabled,
vncserver_proxyclient_address => $server_proxyclient_address,
vncproxy_host => $ks_console_public_host,
vncproxy_protocol => $ks_console_public_proto,
vncproxy_port => $novnc_port,
virtio_nic => false,
neutron_enabled => true
}
if $::osfamily == 'RedHat' {
file { '/etc/libvirt/qemu.conf':