diff --git a/manifests/init.pp b/manifests/init.pp index 8d419e2a7..09ec3e013 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -444,12 +444,6 @@ class nova( Nova_config<| |> ~> Exec['post-nova_config'] - # TODO - see if these packages can be removed - # they should be handled as package deps by the OS - package { 'python-greenlet': - ensure => present, - } - if $install_utilities { class { '::nova::utilities': } } @@ -459,9 +453,8 @@ class nova( anchor { 'nova-start': } package { 'python-nova': - ensure => $ensure_package, - require => Package['python-greenlet'], - tag => ['openstack'], + ensure => $ensure_package, + tag => ['openstack'], } package { 'nova-common': diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index 73c7eaa09..f59ee9283 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -11,13 +11,9 @@ describe 'nova' do end it 'installs packages' do - is_expected.to contain_package('python-greenlet').with( - :ensure => 'present', - ) is_expected.to contain_package('python-nova').with( - :ensure => 'present', - :require => 'Package[python-greenlet]', - :tag => ['openstack'] + :ensure => 'present', + :tag => ['openstack'] ) is_expected.to contain_package('nova-common').with( :name => platform_params[:nova_common_package],