From e0eb164cf319b6179dc51da93474a00ee920199f Mon Sep 17 00:00:00 2001
From: Swann Croiset <scroiset@mirantis.com>
Date: Fri, 20 Jan 2017 17:45:19 +0100
Subject: [PATCH] Fix MySQL resource name in Pacemaker with MOS 8.0

Change-Id: I571d178d973a81d73be71eae87e7fac5db893119
---
 deployment_scripts/puppet/manifests/collectd.pp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/deployment_scripts/puppet/manifests/collectd.pp b/deployment_scripts/puppet/manifests/collectd.pp
index 1375f8c24..f1646cbfd 100644
--- a/deployment_scripts/puppet/manifests/collectd.pp
+++ b/deployment_scripts/puppet/manifests/collectd.pp
@@ -119,8 +119,14 @@ if hiera('lma::collector::influxdb::server', false) {
   }
   # Deal with detach-* plugins
   if $is_mysql_server {
+    $fuel_version = 0 + hiera('fuel_version')
+    if $fuel_version < 9.0 {
+      $mysql_resource_name = 'p_mysql'
+    } else {
+      $mysql_resource_name = 'p_mysqld'
+    }
     $mysql_resource = {
-      'p_mysqld' => 'mysqld',
+      "${mysql_resource_name}" => 'mysqld',
     }
   }
   else {