aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-28 13:14:30 +0000
committerGerrit Code Review <review@openstack.org>2016-07-28 13:14:30 +0000
commit9d81892ea1bcfb66230a12ff397ac5681369e70e (patch)
tree9399618faf5cfed2b1e2f38c3048c019a0b3d49c
parent23955818f2acd4226ebebd5ef449df07e098d1bd (diff)
parent7a4ac41ec499867a38a9078eea356b9912fbf3c0 (diff)
Merge "Remove global openstack-core resource"
-rw-r--r--manifests/profile/base/pacemaker.pp6
-rw-r--r--manifests/profile/pacemaker/database/mysql.pp11
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']],
- }
- }
}
}