From: François Charlier <francois.charlier@enovance.com>
Date: Mon, 18 Feb 2013 17:33:02 +0000 (+0100)
Subject: Fix adding notification_driver parameters to the nova.conf
X-Git-Tag: grizzly-eol~18
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ad09c746cc7052bcbe22cc0651a2f0b4ceea060a;p=puppet-modules%2Fpuppet-ceilometer.git

Fix adding notification_driver parameters to the nova.conf
---

diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
index a8e1059..a2ccd83 100644
--- a/manifests/agent/compute.pp
+++ b/manifests/agent/compute.pp
@@ -56,20 +56,21 @@ class ceilometer::agent::compute(
   }
 
   Nova_config<| |> {
-    before +> Exec[
+    before +> File_line[
       'nova-notification-driver-common',
       'nova-notification-driver-ceilometer'
     ],
   }
 
-  exec { 'nova-notification-driver-common':
-    command => 'git config --file nova.conf --add notification_driver nova.openstack.common.notifier.rabbit_notifier',
-    onlyif  => 'git config --file nova.conf --get notification_driver nova.openstack.common.notifier.rabbit_notifier',
-  }
+  File_line['nova-notification-driver-common', 'nova-notification-driver-ceilometer'] ~> Service['nova-compute']
 
-  exec { 'nova-notification-driver-ceilometer':
-    command => 'git config --file nova.conf --add notification_driver ceilometer.compute.nova_notifier',
-    onlyif  => 'git config --file nova.conf --get notification_driver ceilometer.compute.nova_notifier',
+  file_line {
+    'nova-notification-driver-common':
+      line => 'notification_driver=nova.openstack.common.notifier.rabbit_notifier',
+      path => '/etc/nova/nova.conf';
+    'nova-notification-driver-ceilometer':
+      line => 'notification_driver=ceilometer.compute.nova_notifier',
+      path => '/etc/nova/nova.conf';
   }
 
 }