Define Glance Pacemaker resources on $pacemaker_master node only

Previously the Glance Pacemaker resources were mistakenly defined
on all nodes causing intermittent duplication errors.

Change-Id: I839ee49b153aa96ec08ebdb7e44aaeac28785963

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 9934453..3626f5b 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -738,31 +738,30 @@ if hiera('step') >= 4 {
                   Pacemaker::Resource::Service[$::cinder::params::volume_service]],
     }
 
-  }
-
-  # Glance
-  pacemaker::resource::service { $::glance::params::registry_service_name :
-    clone_params => "interleave=true",
-  }
-  pacemaker::resource::service { $::glance::params::api_service_name :
-    clone_params => "interleave=true",
-  }
+    # Glance
+    pacemaker::resource::service { $::glance::params::registry_service_name :
+      clone_params => "interleave=true",
+    }
+    pacemaker::resource::service { $::glance::params::api_service_name :
+      clone_params => "interleave=true",
+    }
 
-  pacemaker::constraint::base { 'glance-registry-then-glance-api-constraint':
-    constraint_type => "order",
-    first_resource  => "${::glance::params::registry_service_name}-clone",
-    second_resource => "${::glance::params::api_service_name}-clone",
-    first_action    => "start",
-    second_action   => "start",
-    require => [Pacemaker::Resource::Service[$::glance::params::registry_service_name],
-                Pacemaker::Resource::Service[$::glance::params::api_service_name]],
-  }
-  pacemaker::constraint::colocation { 'glance-registry-with-glance-api-colocation':
-    source  => "${::glance::params::registry_service_name}-clone",
-    target  => "${::glance::params::api_service_name}-clone",
-    score   => "INFINITY",
-    require => [Pacemaker::Resource::Service[$::glance::params::registry_service_name],
-                Pacemaker::Resource::Service[$::glance::params::api_service_name]],
+    pacemaker::constraint::base { 'glance-registry-then-glance-api-constraint':
+      constraint_type => "order",
+      first_resource  => "${::glance::params::registry_service_name}-clone",
+      second_resource => "${::glance::params::api_service_name}-clone",
+      first_action    => "start",
+      second_action   => "start",
+      require => [Pacemaker::Resource::Service[$::glance::params::registry_service_name],
+                  Pacemaker::Resource::Service[$::glance::params::api_service_name]],
+    }
+    pacemaker::constraint::colocation { 'glance-registry-with-glance-api-colocation':
+      source  => "${::glance::params::registry_service_name}-clone",
+      target  => "${::glance::params::api_service_name}-clone",
+      score   => "INFINITY",
+      require => [Pacemaker::Resource::Service[$::glance::params::registry_service_name],
+                  Pacemaker::Resource::Service[$::glance::params::api_service_name]],
+    }
   }
 
 } #END STEP 4