Merge "Remove global openstack-core resource"

2 files changed, 0 insertions, 17 deletions

diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp
index 1785656..de3de3c 100644
--- a/manifests/profile/base/pacemaker.pp
+++ b/manifests/profile/base/pacemaker.pp
@@ -81,12 +81,6 @@ class tripleo::profile::base::pacemaker (
   if $step >= 2 {
     if $pacemaker_master {
       include ::pacemaker::resource_defaults
-
-      # Create an openstack-core dummy resource. See RHBZ 1290121
-      pacemaker::resource::ocf { 'openstack-core':
-        ocf_agent_name => 'heartbeat:Dummy',
-        clone_params   => 'interleave=true',
-      }
     }
   }
 
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index 80015d0..cc95092 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -168,17 +168,6 @@ MYSQL_HOST=localhost\n",
   password=\"${mysql_root_password}\"",
       require => Exec['galera-set-root-password'],
     }
-    if $pacemaker_master {
-      pacemaker::constraint::base { 'galera-then-openstack-core-constraint':
-        constraint_type => 'order',
-        first_resource  => 'galera-master',
-        second_resource => 'openstack-core-clone',
-        first_action    => 'promote',
-        second_action   => 'start',
-        require         => [Pacemaker::Resource::Ocf['galera'],
-                            Pacemaker::Resource::Ocf['openstack-core']],
-      }
-    }
   }
 
 }