openstack/fuel-library
Code Issues Proposed changes

Add missing notify dependencies

Browse Source 
Packages should notify services to
restart if package is updated

Closes-Bug: 1362675
Change-Id: Ibd3e34d0e0834dfe5e29eeb4a4526f510f693680
This commit is contained in:
Dmitry Ilyin 2014-08-28 19:28:15 +04:00
parent 628023a658
commit 64208c07fa
16 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/ceilometer/manifests/agent_notification.pp
View File

@ -31,7 +31,7 @@ class ceilometer::agent_notification (
}
}
Package['ceilometer-agent-notification'] -> Service['ceilometer-agent-notification']
Package['ceilometer-agent-notification'] ~> Service['ceilometer-agent-notification']
if $swift {
class { 'swift::notify::ceilometer':

4
deployment/puppet/cinder/manifests/api.pp
View File

@ -101,7 +101,8 @@ class cinder::api (
if $::cinder::params::api_package {
Package['cinder-api'] -> Cinder_config<||>
Package['cinder-api'] -> Cinder_api_paste_ini<||>
Package['cinder-api'] -> Service['cinder-api']
Package['cinder-api'] ~> Service['cinder-api']
Package['cinder'] ~> Service['cinder-api']
package { 'cinder-api':
ensure => $package_ensure,
name => $::cinder::params::api_package,
@ -134,7 +135,6 @@ class cinder::api (
name => $::cinder::params::api_service,
enable => $enabled,
hasstatus => true,
require => Package['cinder'],
}
cinder_config {

4
deployment/puppet/cinder/manifests/backup.pp
View File

@ -53,7 +53,8 @@ class cinder::backup (
if $::cinder::params::backup_package {
Package['cinder-backup'] -> Cinder_config<||>
Package['cinder-backup'] -> Service['cinder-backup']
Package['cinder-backup'] ~> Service['cinder-backup']
Package['cinder'] ~> Service['cinder-backup']
package { 'cinder-backup':
ensure => $package_ensure,
name => $::cinder::params::backup_package,
@ -71,7 +72,6 @@ class cinder::backup (
name => $::cinder::params::backup_service,
enable => $enabled,
hasstatus => true,
require => Package['cinder'],
}
cinder_config {

4
deployment/puppet/cinder/manifests/scheduler.pp
View File

@ -21,7 +21,8 @@ class cinder::scheduler (
if $::cinder::params::scheduler_package {
Package['cinder-scheduler'] -> Cinder_config<||>
Package['cinder-scheduler'] -> Cinder_api_paste_ini<||>
Package['cinder-scheduler'] -> Service['cinder-scheduler']
Package['cinder-scheduler'] ~> Service['cinder-scheduler']
Package['cinder'] ~> Service['cinder-scheduler']
package { 'cinder-scheduler':
ensure => $package_ensure,
name => $::cinder::params::scheduler_package,
@ -41,6 +42,5 @@ class cinder::scheduler (
name => $::cinder::params::scheduler_service,
enable => $enabled,
hasstatus => true,
require => Package['cinder'],
}
}

4
deployment/puppet/cinder/manifests/volume.pp
View File

@ -15,7 +15,8 @@ class cinder::volume (
Package['cinder-volume'] -> Cinder_config<||>
Package['cinder-volume'] -> Cinder_api_paste_ini<||>
Package['cinder'] -> Package['cinder-volume']
Package['cinder-volume'] -> Service['cinder-volume']
Package['cinder-volume'] ~> Service['cinder-volume']
Package['cinder'] ~> Service['cinder-volume']
package { 'cinder-volume':
ensure => $package_ensure,
name => $::cinder::params::volume_package,
@ -35,6 +36,5 @@ class cinder::volume (
name => $::cinder::params::volume_service,
enable => $enabled,
hasstatus => true,
require => Package['cinder'],
}
}

1
deployment/puppet/glance/manifests/api.pp
View File

@ -192,6 +192,7 @@ class glance::api(
Package[$glance::params::api_package_name] -> File['/etc/glance/']
Package[$glance::params::api_package_name] -> Glance_api_config<||>
Package[$glance::params::api_package_name] -> Glance_cache_config<||>
Package[$glance::params::api_package_name] ~> Service['glance-api']
# adding all of this stuff b/c it devstack says glance-api uses the
# db now

1
deployment/puppet/glance/manifests/registry.pp
View File

@ -139,6 +139,7 @@ class glance::registry(
Package[$glance::params::registry_package_name] -> File['/etc/glance/']
Package[$glance::params::registry_package_name] -> Glance_registry_config<||>
Package[$glance::params::registry_package_name] ~> Service['glance-registry']
Glance_registry_config<||> ~> Exec<| title == 'glance-manage db_sync' |>
Glance_registry_config<||> ~> Service['glance-registry']

2
deployment/puppet/heat/manifests/api.pp
View File

@ -13,7 +13,7 @@ class heat::api (
Heat_config<||> ~> Service['heat-api']
Package['heat-api'] -> Heat_config<||>
Package['heat-api'] -> Service['heat-api']
Package['heat-api'] ~> Service['heat-api']
package { 'heat-api':
ensure => installed,

2
deployment/puppet/heat/manifests/api_cfn.pp
View File

@ -13,7 +13,7 @@ class heat::api_cfn (
Heat_config<||> ~> Service['heat-api-cfn']
Package['heat-api-cfn'] -> Heat_config<||>
Package['heat-api-cfn'] -> Service['heat-api-cfn']
Package['heat-api-cfn'] ~> Service['heat-api-cfn']
package { 'heat-api-cfn':
ensure => installed,
name => $::heat::params::api_cfn_package_name,

2
deployment/puppet/heat/manifests/api_cloudwatch.pp
View File

@ -13,7 +13,7 @@ class heat::api_cloudwatch (
Heat_config<||> ~> Service['heat-api-cloudwatch']
Package['heat-api-cloudwatch'] -> Heat_config<||>
Package['heat-api-cloudwatch'] -> Service['heat-api-cloudwatch']
Package['heat-api-cloudwatch'] ~> Service['heat-api-cloudwatch']
package { 'heat-api-cloudwatch':
ensure => installed,
name => $::heat::params::api_cloudwatch_package_name,

2
deployment/puppet/heat/manifests/engine.pp
View File

@ -55,7 +55,7 @@ class heat::engine (
Heat_config<||> ~> Service['heat-engine_service']
Package['heat-engine'] -> Heat_config<||>
Package['heat-engine'] -> Service['heat-engine_service']
Package['heat-engine'] ~> Service['heat-engine_service']
package { 'heat-engine':
ensure => installed,
name => $package_name,

3
deployment/puppet/mellanox_openstack/manifests/agent.pp
View File

@ -54,4 +54,7 @@ class mellanox_openstack::agent (
Mellanox_agent_config <||> ~>
Service[$agent]
Package[$package] ~>
Service[$agent]
}

3
deployment/puppet/mellanox_openstack/manifests/eswitchd.pp
View File

@ -25,4 +25,7 @@ class mellanox_openstack::eswitchd (
Mellanox_eswitchd_config <||> ~>
Service['eswitchd']
Package[$package] ~>
Service['eswitchd']
}

3
deployment/puppet/neutron/manifests/agents/ml2/ovs.pp
View File

@ -200,7 +200,6 @@ class neutron::agents::ml2::ovs (
# neutron plugin ovs agent package. The configuration file for
# the ovs agent is provided by the neutron ovs plugin package.
Package['neutron-ovs-agent'] -> Neutron_plugin_ml2<||>
Package['neutron-ovs-agent'] -> Service['ovs-cleanup-service']
if ! defined(Package['neutron-ovs-agent']) {
package { 'neutron-ovs-agent':
@ -223,6 +222,7 @@ class neutron::agents::ml2::ovs (
require => Class['neutron'],
provider => $service_provider
}
Package <| title == 'neutron-ovs-agent' |> ~> Service['neutron-ovs-agent-service']
if $::neutron::params::ovs_cleanup_service {
service {'ovs-cleanup-service':
@ -230,5 +230,6 @@ class neutron::agents::ml2::ovs (
name => $::neutron::params::ovs_cleanup_service,
enable => $enabled,
}
Package <| title == 'neutron-ovs-agent' |> ~> Service['ovs-cleanup-service']
}
}

4
deployment/puppet/plugin_neutronnsx/manifests/install_ovs.pp
View File

@ -30,7 +30,7 @@ class plugin_neutronnsx::install_ovs (
Package['dkms'] -> Package['openvswitch-datapath']
Package['openvswitch-common'] -> Package['openvswitch-switch'] ->
Package['nicira-ovs-hypervisor-node'] -> Service['nicira-ovs-hypervisor-node']
Package['nicira-ovs-hypervisor-node'] ~> Service['nicira-ovs-hypervisor-node']
}
/(?i)redhat/: {
Package<| title=="openvswitch-common" |> {
@ -50,7 +50,7 @@ class plugin_neutronnsx::install_ovs (
}
Package['openvswitch-common'] ->
Package['nicira-ovs-hypervisor-node'] ->
Package['nicira-ovs-hypervisor-node'] ~>
Service['nicira-ovs-hypervisor-node']
}
default: {

1
deployment/puppet/swift/manifests/proxy.pp
View File

@ -123,4 +123,5 @@ class swift::proxy(
require => [Concat['/etc/swift/proxy-server.conf']],
subscribe => [Concat['/etc/swift/proxy-server.conf']],
}
Package['swift-proxy'] ~> Service['swift-proxy']
}