openstack/puppet-murano
Code Issues Proposed changes

Fix service and package tags

Browse Source 
Sync db class contains notification for murano services after
executing db sync, but all services doesn't have proper tag.

Change-Id: I4ac69bb021462250c149e183990c76e3a261c29a
This commit is contained in:
Denis Egorenko 2015-12-09 17:29:24 +03:00
parent 1fe809faaf
commit b8f767d71c
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/api.pp
View File

@ -60,6 +60,7 @@ class murano::api(
package { 'murano-api':
ensure => $package_ensure,
name => $::murano::params::api_package_name,
tag => ['openstack', 'murano-package'],
}
service { 'murano-api':
@ -67,6 +68,7 @@ class murano::api(
name => $::murano::params::api_service_name,
enable => $enabled,
require => Package['murano-api'],
tag => 'murano-service',
}
Package['murano-api'] ~> Service['murano-api']

2
manifests/cfapi.pp
View File

@ -54,6 +54,7 @@ class murano::cfapi(
package { 'murano-cfapi':
ensure => $package_ensure,
name => $::murano::params::cfapi_package_name,
tag => ['openstack', 'murano-package'],
}
service { 'murano-cfapi':
@ -61,6 +62,7 @@ class murano::cfapi(
name => $::murano::params::cfapi_service_name,
enable => $enabled,
require => Package['murano-cfapi'],
tag => 'murano-service',
}
Package['murano-cfapi'] ~> Service['murano-cfapi']

2
manifests/engine.pp
View File

@ -45,6 +45,7 @@ class murano::engine(
package { 'murano-engine':
ensure => $package_ensure,
name => $::murano::params::engine_package_name,
tag => ['openstack', 'murano-package'],
}
service { 'murano-engine':
@ -52,6 +53,7 @@ class murano::engine(
name => $::murano::params::engine_service_name,
enable => $enabled,
require => Package['murano-engine'],
tag => 'murano-service',
}
Package['murano-engine'] ~> Service['murano-engine']

12
spec/shared_examples.rb
View File

@ -11,12 +11,14 @@ shared_examples 'generic murano service' do |service|
is_expected.to contain_package(service[:name]).with({
:name => service[:package_name],
:ensure => 'present',
:notify => ["Service[#{service[:name]}]"]
:notify => ["Service[#{service[:name]}]"],
:tag => [ 'openstack', 'murano-package'],
})
is_expected.to contain_service(service[:name]).with({
:name => service[:service_name],
:ensure => 'running',
:enable => true
:enable => true,
:tag => 'murano-service',
})
end
end
@ -31,12 +33,14 @@ shared_examples 'generic murano service' do |service|
is_expected.to contain_package(service[:name]).with({
:name => service[:package_name],
:ensure => '2014.2-1',
:notify => ["Service[#{service[:name]}]"]
:notify => ["Service[#{service[:name]}]"],
:tag => [ 'openstack', 'murano-package'],
})
is_expected.to contain_service(service[:name]).with({
:name => service[:service_name],
:ensure => 'running',
:enable => true
:enable => true,
:tag => 'murano-service',
})
end
end