diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-04-22 16:45:56 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2016-05-03 22:44:16 +0200 |
| commit | e284e21405e9d50bfe114178a955918eddfbfaee (patch) | |
| tree | 4448b29d791b67df2f06e002465118732a05d6d2 /manifests/profile/pacemaker/glance.pp | |
| parent | 1b13c573641fd5ab2355faa3ecb89ad7ce1a76d3 (diff) | |
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
Diffstat (limited to 'manifests/profile/pacemaker/glance.pp')
| -rw-r--r-- | manifests/profile/pacemaker/glance.pp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/manifests/profile/pacemaker/glance.pp b/manifests/profile/pacemaker/glance.pp index 5727622..cb2add1 100644 --- a/manifests/profile/pacemaker/glance.pp +++ b/manifests/profile/pacemaker/glance.pp @@ -68,16 +68,17 @@ class tripleo::profile::pacemaker::glance ( $pacemaker_master = false } + class { '::tripleo::profile::base::glance::api': + manage_service => false, + enabled => false, + } + class { '::tripleo::profile::base::glance::registry': + sync_db => $pacemaker_master, + manage_service => false, + enabled => false, + } + if $step >= 4 { - class { '::tripleo::profile::base::glance::api': - manage_service => false, - enabled => false, - } - class { '::tripleo::profile::base::glance::registry': - sync_db => $pacemaker_master, - manage_service => false, - enabled => false, - } if $glance_backend == 'file' and $glance_file_pcmk_manage { $secontext = 'context="system_u:object_r:glance_var_lib_t:s0"' pacemaker::resource::filesystem { 'glance-fs': |