]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commitdiff
Don't match commented [DEFAULT]
authorMartin Magr <mmagr@redhat.com>
Mon, 3 Feb 2014 13:31:26 +0000 (14:31 +0100)
committerMartin Magr <mmagr@redhat.com>
Mon, 3 Feb 2014 13:31:26 +0000 (14:31 +0100)
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

manifests/agent/compute.pp

index acb60eaee12242490266ca5e7f80f856183896e4..c07d717afb9c09350219cc1c426824d0440c44ac 100644 (file)
@@ -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'];
   }