Nova: Add novnc console support

* Keep spice as default console
  * Add new haproxy listener (6080)
  * Configure nova::compute and nova::vncproxy

Change-Id: Iee10af9f95c413c8d89fc86ef336d14a299a9b9c
This commit is contained in:
Dimitri Savineau
2014-12-11 10:39:35 -05:00
parent 091bb9ebe9
commit 121c648960
6 changed files with 171 additions and 30 deletions

View File

@@ -71,8 +71,8 @@ describe 'cloud::compute::hypervisor' do
:nova_ssh_private_key => 'secrete',
:nova_ssh_public_key => 'public',
:ks_nova_public_proto => 'http',
:ks_spice_public_proto => 'https',
:ks_spice_public_host => '10.0.0.2',
:ks_console_public_proto => 'https',
:ks_console_public_host => '10.0.0.2',
:vm_rbd => false,
:volume_rbd => false,
:nova_shell => false,
@@ -235,6 +235,26 @@ describe 'cloud::compute::hypervisor' do
is_expected.to contain_nova_config('libvirt/block_migration_flag').with('value' => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_NON_SHARED_INC')
end
context 'witch novnc console' do
before :each do
params.merge!(
:console => 'novnc',
:novnc_port => '6080' )
end
it 'configure nova-compute' do
is_expected.to contain_class('nova::compute').with(
:enabled => true,
:vnc_enabled => true,
:vncserver_proxyclient_address => '7.0.0.1',
:vncproxy_host => '10.0.0.2',
:vncproxy_protocol => 'https',
:vncproxy_port => '6080',
:virtio_nic => false,
:neutron_enabled => true
)
end
end
context 'with dbus on Ubuntu' do
let :facts do
{ :osfamily => 'Debian',