Merge "Add tag to package and service resources"
This commit is contained in:
commit
b2875e2d67
|
@ -68,6 +68,7 @@ define tuskar::generic_service(
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
name => $package_name,
|
name => $package_name,
|
||||||
notify => Service[$tuskar_title],
|
notify => Service[$tuskar_title],
|
||||||
|
tag => ['openstack', 'tuskar-package'],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -86,6 +87,7 @@ define tuskar::generic_service(
|
||||||
name => $service_name,
|
name => $service_name,
|
||||||
enable => $enabled,
|
enable => $enabled,
|
||||||
hasstatus => true,
|
hasstatus => true,
|
||||||
|
tag => 'tuskar-service',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,12 +39,14 @@ class tuskar::ui (
|
||||||
package { 'tuskar-ui':
|
package { 'tuskar-ui':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
name => $::tuskar::params::ui_package_name,
|
name => $::tuskar::params::ui_package_name,
|
||||||
|
tag => ['openstack', 'tuskar-package'],
|
||||||
}
|
}
|
||||||
|
|
||||||
if $extras {
|
if $extras {
|
||||||
package { 'tuskar-ui-extras':
|
package { 'tuskar-ui-extras':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
name => $::tuskar::params::ui_extras_package_name,
|
name => $::tuskar::params::ui_extras_package_name,
|
||||||
|
tag => ['openstack', 'tuskar-package'],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ describe 'tuskar::ui' do
|
||||||
is_expected.to contain_package('tuskar-ui').with(
|
is_expected.to contain_package('tuskar-ui').with(
|
||||||
:name => platform_params[:ui_package_name],
|
:name => platform_params[:ui_package_name],
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
|
:tag => ['openstack', 'tuskar-package'],
|
||||||
)
|
)
|
||||||
is_expected.to_not contain_package('tuskar-ui-extras')
|
is_expected.to_not contain_package('tuskar-ui-extras')
|
||||||
end
|
end
|
||||||
|
@ -25,10 +26,12 @@ describe 'tuskar::ui' do
|
||||||
is_expected.to contain_package('tuskar-ui').with(
|
is_expected.to contain_package('tuskar-ui').with(
|
||||||
:name => platform_params[:ui_package_name],
|
:name => platform_params[:ui_package_name],
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
|
:tag => ['openstack', 'tuskar-package'],
|
||||||
)
|
)
|
||||||
is_expected.to contain_package('tuskar-ui-extras').with(
|
is_expected.to contain_package('tuskar-ui-extras').with(
|
||||||
:name => platform_params[:ui_extras_package_name],
|
:name => platform_params[:ui_extras_package_name],
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
|
:tag => ['openstack', 'tuskar-package'],
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -41,6 +44,7 @@ describe 'tuskar::ui' do
|
||||||
is_expected.to contain_package('tuskar-ui').with(
|
is_expected.to contain_package('tuskar-ui').with(
|
||||||
:name => platform_params[:ui_package_name],
|
:name => platform_params[:ui_package_name],
|
||||||
:ensure => 'absent',
|
:ensure => 'absent',
|
||||||
|
:tag => ['openstack', 'tuskar-package'],
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -11,13 +11,15 @@ shared_examples 'generic Tuskar service' do |service|
|
||||||
is_expected.to contain_package(service[:name]).with({
|
is_expected.to contain_package(service[:name]).with({
|
||||||
:name => service[:package_name],
|
:name => service[:package_name],
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:notify => "Service[#{service[:name]}]"
|
:notify => "Service[#{service[:name]}]",
|
||||||
|
:tag => ['openstack', 'tuskar-package'],
|
||||||
})
|
})
|
||||||
is_expected.to contain_service(service[:name]).with({
|
is_expected.to contain_service(service[:name]).with({
|
||||||
:name => service[:service_name],
|
:name => service[:service_name],
|
||||||
:ensure => 'stopped',
|
:ensure => 'stopped',
|
||||||
:hasstatus => true,
|
:hasstatus => true,
|
||||||
:enable => false
|
:enable => false,
|
||||||
|
:tag => 'tuskar-service',
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -32,13 +34,15 @@ shared_examples 'generic Tuskar service' do |service|
|
||||||
is_expected.to contain_package(service[:name]).with({
|
is_expected.to contain_package(service[:name]).with({
|
||||||
:name => service[:package_name],
|
:name => service[:package_name],
|
||||||
:ensure => '2014.1-1',
|
:ensure => '2014.1-1',
|
||||||
:notify => "Service[#{service[:name]}]"
|
:notify => "Service[#{service[:name]}]",
|
||||||
|
:tag => ['openstack', 'tuskar-package'],
|
||||||
})
|
})
|
||||||
is_expected.to contain_service(service[:name]).with({
|
is_expected.to contain_service(service[:name]).with({
|
||||||
:name => service[:service_name],
|
:name => service[:service_name],
|
||||||
:ensure => 'running',
|
:ensure => 'running',
|
||||||
:hasstatus => true,
|
:hasstatus => true,
|
||||||
:enable => true
|
:enable => true,
|
||||||
|
:tag => 'tuskar-service',
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue