From 1aee777f24576640cc7438e8df63264724ee0ace Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Mon, 16 Dec 2013 12:08:57 +0100
Subject: [PATCH] Clone Pacemaker RA from upstream

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 params.pp               | 18 +++++++++---------
 roles/spof/spof_node.pp | 24 +++++++++++++++++++-----
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/params.pp b/params.pp
index bf914bec..4486f80d 100644
--- a/params.pp
+++ b/params.pp
@@ -27,15 +27,15 @@ class os_params {
   }
 
   # General parameters
-  $compute = False
-  $debug = False
-  $install_packages = False
-  $os_release = 'havana'
-  $region = 'enovance-ci'
-  $site_domain = 'enovance.com'
-  $storage = True
-  $verbose = False
-  $spof_nodes_are_separate = False
+  $compute                  = False
+  $debug                    = False
+  $install_packages         = False
+  $os_release               = 'havana'
+  $region                   = 'enovance-ci'
+  $site_domain              = 'enovance.com'
+  $storage                  = True
+  $verbose                  = False
+  $spof_nodes_are_separated = False
 
   # Root hashed password
   # ToDo(EmilienM): Disable root user in all nodes and use sudo
diff --git a/roles/spof/spof_node.pp b/roles/spof/spof_node.pp
index 2ad6e6a0..6511c413 100644
--- a/roles/spof/spof_node.pp
+++ b/roles/spof/spof_node.pp
@@ -18,9 +18,16 @@
 
 class os_spof_node(
   $debug                          = $os_params::debug,
-  $spof_nodes_are_separate        = $os_params::spof_nodes_are_separate,
+  $spof_nodes_are_separated       = $os_params::spof_nodes_are_separate,
 ) {
 
+  vcsrepo { '/usr/lib/ocf/resource.d/openstack/':
+    ensure   => latest,
+    provider => git,
+    source   => 'github.com:madkiss/openstack-resource-agents.git',
+    revision => 'master',
+  }
+
   # Corosync & Pacemaker
   class { 'corosync':
     enable_secauth    => false,
@@ -42,9 +49,16 @@ class os_spof_node(
   }
 
   # Resources managed by Corosync as Active / Passive
+  vcsrepo { '/usr/lib/ocf/resource.d/openstack/':
+    ensure   => latest,
+    provider => git,
+    source   => 'github.com:madkiss/openstack-resource-agents.git',
+    revision => 'master',
+  }
+
   Package['corosync'] ->
   file { '/usr/lib/ocf/resource.d/heartbeat/ceilometer-agent-central':
-    source  => '/scripts/ceilometer-agent-central_resource-agent',
+    source  => '/usr/lib/ocf/resource.d/openstack/ceilometer-agent-central',
     mode    => '0755',
     owner   => 'root',
     group   => 'root',
@@ -61,7 +75,7 @@ class os_spof_node(
 
   Package['corosync'] ->
   file { '/usr/lib/ocf/resource.d/heartbeat/neutron-metadata-agent':
-    source  => '/scripts/neutron-metadata-agent_resource-agent',
+    source  => '/usr/lib/ocf/resource.d/openstack/neutron-metadata-agent',
     mode    => '0755',
     owner   => 'root',
     group   => 'root',
@@ -78,7 +92,7 @@ class os_spof_node(
 
   Package['corosync'] ->
   file { '/usr/lib/ocf/resource.d/heartbeat/heat-engine':
-    source  => '/scripts/heat-engine_resource-agent',
+    source  => '/usr/lib/ocf/resource.d/openstack/heat-engine',
     mode    => '0755',
     owner   => 'root',
     group   => 'root',
@@ -95,7 +109,7 @@ class os_spof_node(
 
   # If SPOF nodes are separated from controller nodes,
   # we should import common OpenStack classes:
-  if $spof_nodes_are_separate {
+  if $spof_nodes_are_separated {
     class { 'os_network_common': }
     class { 'os_orchestration_common': }
     class { 'os_telemetry_common': }