From 15be3f5f130e81b31b6132ab2835ce7d4906cc18 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Wed, 25 Jan 2017 12:27:00 +0400
Subject: [PATCH] Adjust scope of neutron agent notify

Shift notify under if condition to meet service resource relationship.
Also function has been modified to exclude creation
files with :: symbols.

Change-Id: I2cbf9c4b2c7a9796b7b7ab53733cc489b03e533b
Related-Bug: #1613724
Closes-bug: #1658952
---
 .../manifests/openstack_network/agents/l3.pp             | 9 ++++-----
 .../manifests/openstack_network/agents/metadata.pp       | 9 ++++-----
 .../lib/puppet/parser/functions/is_file_updated.rb       | 7 +++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/l3.pp b/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/l3.pp
index 6b47bed378..2c4297b863 100644
--- a/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/l3.pp
+++ b/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/l3.pp
@@ -51,10 +51,9 @@ class openstack_tasks::openstack_network::agents::l3 {
       ensure => 'installed',
     }
 
-  }
-
-  if is_file_updated('/etc/neutron/neutron.conf', $title) {
-    notify{'neutron.conf has been changed, going to restart l3 agent':
-    } ~> Service['neutron-l3']
+    if is_file_updated('/etc/neutron/neutron.conf', $title) {
+      notify{'neutron.conf has been changed, going to restart l3 agent':
+      } ~> Service['neutron-l3']
+    }
   }
 }
diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/metadata.pp b/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/metadata.pp
index fe74bc63f3..534f0abea8 100644
--- a/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/metadata.pp
+++ b/deployment/puppet/openstack_tasks/manifests/openstack_network/agents/metadata.pp
@@ -55,10 +55,9 @@ class openstack_tasks::openstack_network::agents::metadata {
       ensure => 'installed',
     }
 
-  }
-
-  if is_file_updated('/etc/neutron/neutron.conf', $title) {
-    notify{'neutron.conf has been changed, going to restart neutron metadata':
-    } ~> Service['neutron-ovs-metadata']
+    if is_file_updated('/etc/neutron/neutron.conf', $title) {
+      notify{'neutron.conf has been changed, going to restart neutron metadata':
+      } ~> Service['neutron-metadata']
+    }
   }
 }
diff --git a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/is_file_updated.rb b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/is_file_updated.rb
index 5a9b2e983b..0b3984468f 100644
--- a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/is_file_updated.rb
+++ b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/is_file_updated.rb
@@ -8,11 +8,10 @@ module Puppet::Parser::Functions
               EOS
              ) do |args|
 
-    file = args[0]
-    entity = args[1]
+    file, entity = args
 
-    store_dir = "/var/cache/fuel/#{entity}"
-    store_file = "#{File.basename(file).gsub('/','___')}"
+    store_dir = "/var/cache/fuel/#{entity.gsub('::','_')}"
+    store_file = "#{File.basename(file)}"
     fullpath = "#{store_dir}/#{store_file}"
 
     FileUtils.mkdir_p store_dir