--- a/components/ruby/puppet-modules/openstack-heat/patches/05-engine.patch	Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-heat/patches/05-engine.patch	Wed Sep 07 14:48:35 2016 -0700
@@ -4,7 +4,6 @@
 
 --- openstack-heat-6.1.0/manifests/engine.pp.orig	2016-04-21 08:07:38.280309372 -0700
 +++ openstack-heat-6.1.0/manifests/engine.pp	2016-04-21 08:07:53.510837943 -0700
-@@ -1,3 +1,7 @@
 +#######################################################################
 +# Oracle has modified the originally distributed contents of this file.
 +#######################################################################
@@ -12,42 +11,16 @@
  # == Class: heat::engine
  #
  #  Installs & configure the heat engine service
-@@ -109,16 +113,21 @@
+@@ -122,12 +126,6 @@ class heat::engine (
    include ::heat
    include ::heat::params
- 
-+  if ( $heat::params::engine_package_name != $heat::params::common_package_name ) {
-+    ensure_packages([$heat::params::engine_package_name],
-+      {
-+        ensure => $package_ensure,
-+        name   => $::heat::params::engine_package_name,
-+        tag    => ['openstack'],
-+       notify => $::heat::subscribe_sync_db,
-+      }
-+    )
-+  }
-+
-   Heat_config<||> ~> Service['heat-engine']
- 
--  Package['heat-engine'] -> Heat_config<||>
--  Package['heat-engine'] -> Service['heat-engine']
+
 -  package { 'heat-engine':
 -    ensure => $package_ensure,
 -    name   => $::heat::params::engine_package_name,
--    tag    => 'openstack',
--    notify => $::heat::subscribe_sync_db,
+-    tag    => ['openstack', 'heat-package'],
 -  }
-+  Package[$::heat::params::engine_package_name] -> Heat_config<||>
-+  Package[$::heat::params::engine_package_name] -> Service['heat-engine']
- 
+-
    if $manage_service {
      if $enabled {
-@@ -143,7 +152,7 @@
-     hasrestart => true,
-     require    => [ File['/etc/heat/heat.conf'],
-                     Package['heat-common'],
--                    Package['heat-engine']],
-+                    Package[$::heat::params::engine_package_name]],
-     subscribe  => $::heat::subscribe_sync_db,
-   }
- 
+       $service_ensure = 'running'