From b23ca827e5a36187dcf39eec0b8997dddeae5462 Mon Sep 17 00:00:00 2001
From: Alejandro Andreu <alejandroandreu@openmailbox.org>
Date: Wed, 23 Nov 2016 12:03:39 +0100
Subject: [PATCH] Make contain statements compatible with Puppet 3.6

`contain` statements with absolute class names (that is, with leading
::) are not supported in Puppet 3.6.x. Also quoted classes do not work
properly.

Change-Id: Ie565e432f7de14eaf6bb2a78f1bba2f1f4e30302
---
 manifests/agent.pp   | 8 ++++----
 manifests/cluster.pp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/agent.pp b/manifests/agent.pp
index 82e7bd0..b665531 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -141,7 +141,7 @@ class midonet::agent (
     package_ensure => $package_ensure,
     manage_java    => $manage_java,
   }
-  contain 'midonet::agent::install'
+  contain midonet::agent::install
 
   class { 'midonet::agent::run':
     service_name      => $service_name,
@@ -156,7 +156,7 @@ class midonet::agent (
     dhcp_mtu          => $dhcp_mtu,
     require           => Class['midonet::agent::install'],
   }
-  contain 'midonet::agent::run'
+  contain midonet::agent::run
 
   if $is_mem {
     if $manage_repo == true {
@@ -171,12 +171,12 @@ class midonet::agent (
           mem_password      => $mem_password,
           before            => Class['midonet::agent::scrapper']
         }
-        contain 'midonet::repository'
+        contain midonet::repository
       }
     }
     class { 'midonet::agent::scrapper':
     }
-    contain 'midonet::agent::scrapper'
+    contain midonet::agent::scrapper
   }
   else  {
     notice('Skipping installation of jmx-scrapper')
diff --git a/manifests/cluster.pp b/manifests/cluster.pp
index cf5ee64..bbdab5d 100644
--- a/manifests/cluster.pp
+++ b/manifests/cluster.pp
@@ -140,7 +140,7 @@ class midonet::cluster (
       package_name   => $package_name,
       is_mem         => $is_mem
     }
-    contain 'midonet::cluster::install'
+    contain midonet::cluster::install
 
     class { 'midonet::cluster::run':
       service_name            => $service_name,
@@ -166,5 +166,5 @@ class midonet::cluster (
       package_ensure          => $package_ensure,
       require                 => Class['midonet::cluster::install']
     }
-    contain 'midonet::cluster::run'
+    contain midonet::cluster::run
 }