From e284e21405e9d50bfe114178a955918eddfbfaee Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 22 Apr 2016 16:45:56 +0200 Subject: Move databases creation and sync with the role This change moves the database creation and sync with the role profile, so that it's only executed when the role is enabled and by the role itself. It also calls the non-pacemaker profiles out of the 'step' conditional because the non-pacemaker profiles know how to deal with 'step' already. Change-Id: I6c752cb53090e7ef8e0319bade462f2453ed7660 Related-Bug: 1572952 --- manifests/profile/pacemaker/keystone.pp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'manifests/profile/pacemaker/keystone.pp') diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp index 0f007a5..f2bc827 100644 --- a/manifests/profile/pacemaker/keystone.pp +++ b/manifests/profile/pacemaker/keystone.pp @@ -51,15 +51,13 @@ class tripleo::profile::pacemaker::keystone ( $manage_roles = false } - if $step >= 4 { - class { '::tripleo::profile::base::keystone': - sync_db => $pacemaker_master, - manage_service => false, - enabled => false, - bootstrap_master => $pacemaker_master, - manage_roles => $manage_roles, - manage_endpoint => $manage_roles - } + class { '::tripleo::profile::base::keystone': + sync_db => $pacemaker_master, + manage_service => false, + enabled => false, + bootstrap_master => $pacemaker_master, + manage_roles => $manage_roles, + manage_endpoint => $manage_roles } if $step >= 5 and $pacemaker_master and $enable_load_balancer { @@ -85,4 +83,5 @@ class tripleo::profile::pacemaker::keystone ( Pacemaker::Resource::Ocf['openstack-core']], } } + } -- cgit 1.2.3-korg