From 64208c07fa85b287669b5776d6518bc4a3aed72f Mon Sep 17 00:00:00 2001
From: Dmitry Ilyin <dilyin@mirantis.com>
Date: Thu, 28 Aug 2014 19:28:15 +0400
Subject: [PATCH] Add missing notify dependencies

Packages should notify services to
restart if package is updated

Closes-Bug: 1362675
Change-Id: Ibd3e34d0e0834dfe5e29eeb4a4526f510f693680
---
 deployment/puppet/ceilometer/manifests/agent_notification.pp | 2 +-
 deployment/puppet/cinder/manifests/api.pp                    | 4 ++--
 deployment/puppet/cinder/manifests/backup.pp                 | 4 ++--
 deployment/puppet/cinder/manifests/scheduler.pp              | 4 ++--
 deployment/puppet/cinder/manifests/volume.pp                 | 4 ++--
 deployment/puppet/glance/manifests/api.pp                    | 1 +
 deployment/puppet/glance/manifests/registry.pp               | 1 +
 deployment/puppet/heat/manifests/api.pp                      | 2 +-
 deployment/puppet/heat/manifests/api_cfn.pp                  | 2 +-
 deployment/puppet/heat/manifests/api_cloudwatch.pp           | 2 +-
 deployment/puppet/heat/manifests/engine.pp                   | 2 +-
 deployment/puppet/mellanox_openstack/manifests/agent.pp      | 3 +++
 deployment/puppet/mellanox_openstack/manifests/eswitchd.pp   | 3 +++
 deployment/puppet/neutron/manifests/agents/ml2/ovs.pp        | 3 ++-
 deployment/puppet/plugin_neutronnsx/manifests/install_ovs.pp | 4 ++--
 deployment/puppet/swift/manifests/proxy.pp                   | 1 +
 16 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/deployment/puppet/ceilometer/manifests/agent_notification.pp b/deployment/puppet/ceilometer/manifests/agent_notification.pp
index ca9ceb27c7..0c6c778cae 100644
--- a/deployment/puppet/ceilometer/manifests/agent_notification.pp
+++ b/deployment/puppet/ceilometer/manifests/agent_notification.pp
@@ -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':
diff --git a/deployment/puppet/cinder/manifests/api.pp b/deployment/puppet/cinder/manifests/api.pp
index d7cca900f5..3c9d1989f0 100644
--- a/deployment/puppet/cinder/manifests/api.pp
+++ b/deployment/puppet/cinder/manifests/api.pp
@@ -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 {
diff --git a/deployment/puppet/cinder/manifests/backup.pp b/deployment/puppet/cinder/manifests/backup.pp
index a8c575a095..d78aa80fe1 100644
--- a/deployment/puppet/cinder/manifests/backup.pp
+++ b/deployment/puppet/cinder/manifests/backup.pp
@@ -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 {
diff --git a/deployment/puppet/cinder/manifests/scheduler.pp b/deployment/puppet/cinder/manifests/scheduler.pp
index 26b1e58544..0ebe5958c1 100644
--- a/deployment/puppet/cinder/manifests/scheduler.pp
+++ b/deployment/puppet/cinder/manifests/scheduler.pp
@@ -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'],
   }
 }
diff --git a/deployment/puppet/cinder/manifests/volume.pp b/deployment/puppet/cinder/manifests/volume.pp
index 6617991eba..27d6819d04 100644
--- a/deployment/puppet/cinder/manifests/volume.pp
+++ b/deployment/puppet/cinder/manifests/volume.pp
@@ -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'],
   }
 }
diff --git a/deployment/puppet/glance/manifests/api.pp b/deployment/puppet/glance/manifests/api.pp
index 9654fe085e..94919d736e 100644
--- a/deployment/puppet/glance/manifests/api.pp
+++ b/deployment/puppet/glance/manifests/api.pp
@@ -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
diff --git a/deployment/puppet/glance/manifests/registry.pp b/deployment/puppet/glance/manifests/registry.pp
index 10f584d135..d1781a3812 100644
--- a/deployment/puppet/glance/manifests/registry.pp
+++ b/deployment/puppet/glance/manifests/registry.pp
@@ -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']
diff --git a/deployment/puppet/heat/manifests/api.pp b/deployment/puppet/heat/manifests/api.pp
index ef4e454600..eecd282d3d 100644
--- a/deployment/puppet/heat/manifests/api.pp
+++ b/deployment/puppet/heat/manifests/api.pp
@@ -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,
diff --git a/deployment/puppet/heat/manifests/api_cfn.pp b/deployment/puppet/heat/manifests/api_cfn.pp
index 41c4d37d78..82169f621c 100644
--- a/deployment/puppet/heat/manifests/api_cfn.pp
+++ b/deployment/puppet/heat/manifests/api_cfn.pp
@@ -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,
diff --git a/deployment/puppet/heat/manifests/api_cloudwatch.pp b/deployment/puppet/heat/manifests/api_cloudwatch.pp
index ac4e7c8483..ce8c42f544 100644
--- a/deployment/puppet/heat/manifests/api_cloudwatch.pp
+++ b/deployment/puppet/heat/manifests/api_cloudwatch.pp
@@ -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,
diff --git a/deployment/puppet/heat/manifests/engine.pp b/deployment/puppet/heat/manifests/engine.pp
index 1f6d6c073e..5f67702c9b 100644
--- a/deployment/puppet/heat/manifests/engine.pp
+++ b/deployment/puppet/heat/manifests/engine.pp
@@ -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,
diff --git a/deployment/puppet/mellanox_openstack/manifests/agent.pp b/deployment/puppet/mellanox_openstack/manifests/agent.pp
index 3aebcf819e..4960ffa09e 100644
--- a/deployment/puppet/mellanox_openstack/manifests/agent.pp
+++ b/deployment/puppet/mellanox_openstack/manifests/agent.pp
@@ -54,4 +54,7 @@ class mellanox_openstack::agent (
     Mellanox_agent_config <||> ~>
     Service[$agent]
 
+    Package[$package] ~>
+    Service[$agent]
+
 }
diff --git a/deployment/puppet/mellanox_openstack/manifests/eswitchd.pp b/deployment/puppet/mellanox_openstack/manifests/eswitchd.pp
index b382927548..2dd9f647cf 100644
--- a/deployment/puppet/mellanox_openstack/manifests/eswitchd.pp
+++ b/deployment/puppet/mellanox_openstack/manifests/eswitchd.pp
@@ -25,4 +25,7 @@ class mellanox_openstack::eswitchd (
     Mellanox_eswitchd_config <||> ~>
     Service['eswitchd']
 
+    Package[$package] ~>
+    Service['eswitchd']
+
 }
diff --git a/deployment/puppet/neutron/manifests/agents/ml2/ovs.pp b/deployment/puppet/neutron/manifests/agents/ml2/ovs.pp
index 2cc22c5bba..395f187bac 100644
--- a/deployment/puppet/neutron/manifests/agents/ml2/ovs.pp
+++ b/deployment/puppet/neutron/manifests/agents/ml2/ovs.pp
@@ -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']
   }
 }
diff --git a/deployment/puppet/plugin_neutronnsx/manifests/install_ovs.pp b/deployment/puppet/plugin_neutronnsx/manifests/install_ovs.pp
index 28fddc1a63..0cadb827f5 100644
--- a/deployment/puppet/plugin_neutronnsx/manifests/install_ovs.pp
+++ b/deployment/puppet/plugin_neutronnsx/manifests/install_ovs.pp
@@ -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: {
diff --git a/deployment/puppet/swift/manifests/proxy.pp b/deployment/puppet/swift/manifests/proxy.pp
index 3955f45036..9ec22dec6a 100644
--- a/deployment/puppet/swift/manifests/proxy.pp
+++ b/deployment/puppet/swift/manifests/proxy.pp
@@ -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']
 }