openstack/puppet-nova
Code Issues Proposed changes

do not manage python-greenlet anymore

Browse Source 
Packaging already manages python-greenlet dependency for a while.
Stop using Puppet for managing this dependency.

Change-Id: Iaba6e499b1185d75930f0e7b0ca587e9f8705e5a
This commit is contained in:
Emilien Macchi
2015-11-03 16:32:40 -05:00
parent 67c71095bf
commit 64a0f4e6bc
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/init.pp
View File

@@ -444,12 +444,6 @@ class nova(
Nova_config<| |> ~> Exec['post-nova_config'] 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 { if $install_utilities {
class { '::nova::utilities': } class { '::nova::utilities': }
} }
@@ -459,9 +453,8 @@ class nova(
anchor { 'nova-start': } anchor { 'nova-start': }
package { 'python-nova': package { 'python-nova':
ensure => $ensure_package, ensure => $ensure_package,
require => Package['python-greenlet'], tag => ['openstack'],
tag => ['openstack'],
} }
package { 'nova-common': package { 'nova-common':

8
spec/classes/nova_init_spec.rb
View File

@@ -11,13 +11,9 @@ describe 'nova' do
end end
it 'installs packages' do it 'installs packages' do
is_expected.to contain_package('python-greenlet').with(
:ensure => 'present',
)
is_expected.to contain_package('python-nova').with( is_expected.to contain_package('python-nova').with(
:ensure => 'present', :ensure => 'present',
:require => 'Package[python-greenlet]', :tag => ['openstack']
:tag => ['openstack']
) )
is_expected.to contain_package('nova-common').with( is_expected.to contain_package('nova-common').with(
:name => platform_params[:nova_common_package], :name => platform_params[:nova_common_package],