diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-07-26 18:16:26 +0200 |
|---|---|---|
| committer |   Michele Baldessari <michele@acksyn.org> | 2016-07-27 22:49:05 +0200 |
| commit | 7a4ac41ec499867a38a9078eea356b9912fbf3c0 (patch) | |
| tree | a27b4628b61a32b88fe35e5b407d11017e6bf387 | |
| parent | afc67e23700cfe19f6b0f399a87ebea767590b41 (diff) | |
Remove global openstack-core resource
The openstack-core resource is not needed by the NG Pacemaker
architecture. It was moved into an isolated role by [1] so that
it could optionally be enabled when wanting the older architecture.
This submission removes the old openstack-core global resource.
1. I74a62973146c0261385ecf5fd3d06db51e079caa
Change-Id: I16a786ce167c57848551c7245f4344c382c55b3d
| -rw-r--r-- | manifests/profile/base/pacemaker.pp | 6 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/database/mysql.pp | 11 |
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']], - } - } } } |