Remove novnc from vncproxy packages list for Ubuntu

Package resources can no longer have array for name since Puppet 3.4.

Since the package nova-novncproxy already requires novnc,
we can safely remove it from the list of packages to install.

Closes-bug: #1263293
Change-Id: Iba7ff0b7aedd750a54d931e0e8cbe37418ed6aed
This commit is contained in:
Mathieu Gagné
2013-12-22 01:03:11 -05:00
parent 30fc3e2f59
commit d4a8c904b7
2 changed files with 2 additions and 2 deletions

View File

@@ -91,7 +91,7 @@ class nova::params {
}
default: {
$spicehtml5proxy_package_name = 'nova-spiceproxy'
$vncproxy_package_name = ['novnc', 'nova-novncproxy']
$vncproxy_package_name = 'nova-novncproxy'
$vncproxy_service_name = 'nova-novncproxy'
# some of the services need to be started form the special upstart provider
$special_service_provider = 'upstart'

View File

@@ -24,7 +24,7 @@ describe 'nova::vncproxy' do
it { should contain_nova_config('DEFAULT/novncproxy_port').with(:value => '6080') }
it { should contain_package('nova-vncproxy').with(
:name => ["novnc", "nova-novncproxy"],
:name => 'nova-novncproxy',
:ensure => 'present'
) }
it { should contain_service('nova-vncproxy').with(