From 3379835b39aef83b5aa87649bc22f1d01aa0ee45 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Tue, 18 Feb 2014 11:28:02 +0100
Subject: [PATCH] spof: unmanage neutron-metadata-agent

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 manifests/spof.pp | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/manifests/spof.pp b/manifests/spof.pp
index 9c4484e8..8e98680f 100644
--- a/manifests/spof.pp
+++ b/manifests/spof.pp
@@ -74,28 +74,6 @@ class cloud::spof(
       }
     }
   } ->
-  file { '/usr/lib/ocf/resource.d/heartbeat/neutron-metadata-agent':
-    source  => 'puppet:///modules/cloud/heartbeat/neutron-metadata-agent',
-    mode    => '0755',
-    owner   => 'root',
-    group   => 'root',
-  } ->
-  cs_primitive { 'neutron-metadata-agent':
-    primitive_class => 'ocf',
-    primitive_type  => 'neutron-metadata-agent',
-    provided_by     => 'heartbeat',
-    operations      => {
-      'monitor' => {
-        interval  => '10s',
-        timeout   => '30s'
-      },
-      'start'   => {
-        interval  => '0',
-        timeout   => '30s',
-        on-fail   => 'restart'
-      }
-    }
-  } ->
   file { '/usr/lib/ocf/resource.d/heartbeat/heat-engine':
     source  => 'puppet:///modules/cloud/heartbeat/heat-engine',
     mode    => '0755',
@@ -120,10 +98,6 @@ class cloud::spof(
   }
 
   # Run OpenStack SPOF service and disable them since they will be managed by Corosync.
-  class { 'cloud::network::metadata':
-    enabled => false,
-  }
-
   class { 'cloud::orchestration::engine':
     enabled => false,
   }