openstack/puppet-nova
Code Issues Proposed changes

Only tag packages with openstack tag

Browse Source 
We don't need the nova tag since Puppet will auto-tag the nova packages
with the appropriate service name.

Change-Id: Iab3a42dc915b7343eb59887e1a5e769a9ff522cd
Closes-Bug: #1391209
This commit is contained in:
Matt Fischer 2015-02-04 12:53:20 -07:00
parent 6fadda9561
commit d53282fcce
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/client.pp
View File

@ -14,7 +14,7 @@ class nova::client(
package { 'python-novaclient':
ensure => $ensure,
tag => ['openstack', 'nova'],
tag => ['openstack'],
}
}

2
manifests/compute/libvirt.pp
View File

@ -117,7 +117,7 @@ class nova::compute::libvirt (
ensure => present,
before => Package['nova-compute'],
require => Package['nova-common'],
tag => ['openstack', 'nova'],
tag => ['openstack'],
}
}

2
manifests/generic_service.pp
View File

@ -37,7 +37,7 @@ define nova::generic_service(
ensure => $ensure_package,
name => $package_name,
notify => Service[$nova_title],
tag => ['openstack', 'nova'],
tag => ['openstack'],
}
}
}

4
manifests/init.pp
View File

@ -401,14 +401,14 @@ class nova(
package { 'python-nova':
ensure => $ensure_package,
require => Package['python-greenlet'],
tag => ['openstack', 'nova'],
tag => ['openstack'],
}
package { 'nova-common':
ensure => $ensure_package,
name => $::nova::params::common_package_name,
require => [Package['python-nova'], Anchor['nova-start']],
tag => ['openstack', 'nova'],
tag => ['openstack'],
}
file { '/etc/nova/nova.conf':

4
spec/classes/nova_api_spec.rb
View File

@ -29,7 +29,7 @@ describe 'nova::api' do
:name => platform_params[:nova_api_package],
:ensure => 'present',
:notify => 'Service[nova-api]',
:tag => ['openstack', 'nova']
:tag => ['openstack']
)
should_not contain_exec('validate_nova_api')
end
@ -106,7 +106,7 @@ describe 'nova::api' do
should contain_package('nova-api').with(
:name => platform_params[:nova_api_package],
:ensure => '2012.1-2',
:tag => ['openstack', 'nova']
:tag => ['openstack']
)
should contain_service('nova-api').with(
:name => platform_params[:nova_api_service],

2
spec/classes/nova_cells_spec.rb
View File

@ -61,7 +61,7 @@ describe 'nova::cells' do
should contain_package('nova-cells').with(
:ensure => 'present',
:name => platform_params[:cells_package_name],
:tag => ['openstack', 'nova']
:tag => ['openstack']
)
end

2
spec/classes/nova_client_spec.rb
View File

@ -6,7 +6,7 @@ describe 'nova::client' do
it {
should contain_package('python-novaclient').with(
:ensure => 'present',
:tag => ['openstack', 'nova']
:tag => ['openstack']
)
}
end

2
spec/classes/nova_compute_libvirt_spec.rb
View File

@ -17,7 +17,7 @@ describe 'nova::compute::libvirt' do
it { should contain_package('nova-compute-kvm').with(
:ensure => 'present',
:before => 'Package[nova-compute]',
:tag => ['openstack', 'nova']
:tag => ['openstack']
) }
it { should contain_package('libvirt').with(

4
spec/classes/nova_compute_spec.rb
View File

@ -19,7 +19,7 @@ describe 'nova::compute' do
})
should contain_package('nova-compute').with({
:name => platform_params[:nova_compute_package],
:tag => ['openstack', 'nova']
:tag => ['openstack']
})
end
@ -71,7 +71,7 @@ describe 'nova::compute' do
should contain_package('nova-compute').with({
:name => platform_params[:nova_compute_package],
:ensure => '2012.1-2',
:tag => ['openstack', 'nova']
:tag => ['openstack']
})
end

2
spec/classes/nova_init_spec.rb
View File

@ -19,7 +19,7 @@ describe 'nova' do
should contain_package('nova-common').with(
:name => platform_params[:nova_common_package],
:ensure => 'present',
:tag => ['openstack', 'nova']
:tag => ['openstack']
)
end

2
spec/shared_examples.rb
View File

@ -12,7 +12,7 @@ shared_examples 'generic nova service' do |service|
:name => service[:package_name],
:ensure => 'present',
:notify => "Service[#{service[:name]}]",
:tag => ['openstack', 'nova']
:tag => ['openstack']
})
should contain_service(service[:name]).with({
:name => service[:service_name],