diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-20 13:13:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-20 13:13:56 +0000 |
| commit | dfa0db9c7f5ece0914be616f963bf871563e6a1c (patch) | |
| tree | 11daeacdf256a25a41cb5aa49352719ba0cd4fcb /manifests/profile/pacemaker/keystone.pp | |
| parent | e121f195c8e8e33650b5b8a6472191b3f6ea5d21 (diff) | |
| parent | 5927148c4b5813180204c2983b5c95b69a2ad265 (diff) | |
Merge "Make ::tripleo::profile::base classes work with multiple nodes"
Diffstat (limited to 'manifests/profile/pacemaker/keystone.pp')
| -rw-r--r-- | manifests/profile/pacemaker/keystone.pp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp index 46a40db..5a3701b 100644 --- a/manifests/profile/pacemaker/keystone.pp +++ b/manifests/profile/pacemaker/keystone.pp @@ -46,17 +46,11 @@ class tripleo::profile::pacemaker::keystone ( if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true - $manage_roles = true } else { $pacemaker_master = false - $manage_roles = false } - class { '::tripleo::profile::base::keystone': - sync_db => $pacemaker_master, - manage_roles => $manage_roles, - manage_endpoint => $manage_roles - } + include ::tripleo::profile::base::keystone if $step >= 5 and $pacemaker_master and $enable_load_balancer { pacemaker::constraint::base { 'haproxy-then-keystone-constraint': |