Revert "Fix nova notifications"

This reverts commit 6c8b6630b0f671a055070c658e0e0d51350f8353.
This has been fixed in the 2012.2.2 nova packages

diff --git a/files/patches/670b3882-fix-rpc-control_exchange-regression.patch b/files/patches/670b3882-fix-rpc-control_exchange-regression.patch
deleted file mode 100644 (file)
index d54e4be..0000000
--- a/files/patches/670b3882-fix-rpc-control_exchange-regression.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/nova/flags.py
-+++ b/nova/flags.py
-@@ -425,6 +425,9 @@ global_opts = [
-                    'include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, '
-                    'fake.FakeDriver, baremetal.BareMetalDriver, '
-                    'vmwareapi.VMWareESXDriver'),
-+    cfg.StrOpt('control_exchange',
-+               default='nova',
-+               help='AMQP exchange to connect to if using RabbitMQ or Qpid'),
- ]
- 
- FLAGS.register_opts(global_opts)

diff --git a/manifests/init.pp b/manifests/init.pp
index c43a2a598ff1b8d1087334b3e3e2035897022e80..064fcb0458ffbbebff680d6e88dc7b6c6b5d125e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -74,19 +74,4 @@ class ceilometer(
     'DEFAULT/notification_topics'    : value => 'notifications,glance_notifications';
   }
 
-  file { '/tmp/670b3882-fix-rpc-control_exchange-regression.patch':
-    source => 'puppet:///modules/ceilometer/patches/670b3882-fix-rpc-control_exchange-regression.patch'
-  }
-
-  exec { 'patch_nova':
-    command => 'patch -p1 < /tmp/670b3882-fix-rpc-control_exchange-regression.patch',
-    unless  => 'grep -q control_exchange /usr/share/pyshared/nova/flags.py',
-    cwd     => '/usr/share/pyshared',
-    require => Package['python-nova'],
-  }
-
-  Exec['patch_nova'] ~> Service<| title == 'nova-api' |>
-  Exec['patch_nova'] ~> Service<| title == 'nova-compute' |>
-  Exec['patch_nova'] ~> Service<| title == 'nova-network' |>
-
 }