openstack/puppet-ironic
Code Issues Proposed changes

Tag all Ironic packages

Browse Source 
Some users wish to override the default package provider by their own.

Tag all packages with the 'openstack' to allow mass resource attributes
override using resource collectors.

Closes-bug: #1391209

Change-Id: I4ad01a9f55deb441fec12ffa0541584fb5e07478
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
This commit is contained in:
Gael Chamoulaud 2015-03-28 19:43:07 +01:00
parent f1ca7eb98a
commit 952bed761b
7 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/api.pp
View File

@ -115,6 +115,7 @@ class ironic::api (
package { 'ironic-api':
ensure => $package_ensure,
name => $::ironic::params::api_package,
tag => 'openstack',
}
}

1
manifests/client.pp
View File

@ -35,6 +35,7 @@ class ironic::client (
package { 'python-ironicclient':
ensure => $package_ensure,
name => $::ironic::params::client_package,
tag => 'openstack',
}
}

1
manifests/conductor.pp
View File

@ -47,6 +47,7 @@ class ironic::conductor (
package { 'ironic-conductor':
ensure => $package_ensure,
name => $::ironic::params::conductor_package,
tag => 'openstack',
}
}

2
manifests/init.pp
View File

@ -182,6 +182,7 @@ class ironic (
package { 'ironic-common':
ensure => $package_ensure,
name => $::ironic::params::common_package_name,
tag => 'openstack',
notify => Exec['ironic-dbsync'],
}
@ -209,6 +210,7 @@ class ironic (
package { 'ironic-database-backend':
ensure => present,
name => $database_backend_package,
tag => 'openstack',
}
}

3
spec/classes/ironic_api_spec.rb
View File

@ -48,7 +48,8 @@ describe 'ironic::api' do
if platform_params.has_key?(:api_package)
is_expected.to contain_package('ironic-api').with(
:name => platform_params[:api_package],
:ensure => p[:package_ensure]
:ensure => p[:package_ensure],
:tag => 'openstack'
)
is_expected.to contain_package('ironic-api').with_before(/Ironic_config\[.+\]/)
is_expected.to contain_package('ironic-api').with_before(/Service\[ironic-api\]/)

3
spec/classes/ironic_conductor_spec.rb
View File

@ -43,7 +43,8 @@ describe 'ironic::conductor' do
if platform_params.has_key?(:conductor_package)
is_expected.to contain_package('ironic-conductor').with(
:name => platform_params[:conductor_package],
:ensure => p[:package_ensure]
:ensure => p[:package_ensure],
:tag => 'openstack'
)
is_expected.to contain_package('ironic-conductor').with_before(/Ironic_config\[.+\]/)
is_expected.to contain_package('ironic-conductor').with_before(/Service\[ironic-conductor\]/)

1
spec/classes/ironic_init_spec.rb
View File

@ -120,6 +120,7 @@ describe 'ironic' do
is_expected.to contain_package('ironic-common').with(
:ensure => 'present',
:name => platform_params[:common_package_name],
:tag => 'openstack',
)
end