From: Martin Magr <mmagr@redhat.com>
Date: Mon, 3 Feb 2014 13:31:26 +0000 (+0100)
Subject: Don't match commented [DEFAULT]
X-Git-Tag: 3.1.0~2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=91045b3be907b074cb1e0165b269d439aee43a26;p=puppet-modules%2Fpuppet-ceilometer.git

Don't match commented [DEFAULT]

Class ceilometer::agent::compute fails when there are [DEFAULT] sections
commented. This patch is fixing this issue. For more info check
https://bugzilla.redhat.com/show_bug.cgi?id=1060712

Change-Id: I6d13f780f63af8798d94b49246576d1e144a4540
(cherry picked from commit a46bbc4c5179d4988f4beec0fc548c91300008a2)
---

diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
index acb60ea..c07d717 100644
--- a/manifests/agent/compute.pp
+++ b/manifests/agent/compute.pp
@@ -65,12 +65,12 @@ class ceilometer::agent::compute (
       line   =>
         'notification_driver=nova.openstack.common.notifier.rpc_notifier',
       path   => '/etc/nova/nova.conf',
-      after  => '\[DEFAULT\]',
+      after  => '^\s*\[DEFAULT\]',
       notify => Service['nova-compute'];
     'nova-notification-driver-ceilometer':
       line   => 'notification_driver=ceilometer.compute.nova_notifier',
       path   => '/etc/nova/nova.conf',
-      after  => '\[DEFAULT\]',
+      after  => '^\s*\[DEFAULT\]',
       notify => Service['nova-compute'];
   }