openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "ha/glance-fs: avoid a race condition"

Browse Source
This commit is contained in:
Jenkins 2016-04-09 08:42:28 +00:00 committed by Gerrit Code Review
commit 2198be8156
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -654,17 +654,6 @@ if hiera('step') >= 4 {
$http_store = ['glance.store.http.Store'] $http_store = ['glance.store.http.Store']
$glance_store = concat($http_store, $backend_store) $glance_store = concat($http_store, $backend_store)
if $glance_backend == 'file' and hiera('glance_file_pcmk_manage', false) {
$secontext = 'context="system_u:object_r:glance_var_lib_t:s0"'
pacemaker::resource::filesystem { 'glance-fs':
device => hiera('glance_file_pcmk_device'),
directory => hiera('glance_file_pcmk_directory'),
fstype => hiera('glance_file_pcmk_fstype'),
fsoptions => join([$secontext, hiera('glance_file_pcmk_options', '')],','),
clone_params => '',
}
}
# TODO: notifications, scrubber, etc. # TODO: notifications, scrubber, etc.
include ::glance include ::glance
include ::glance::config include ::glance::config
@ -1340,6 +1329,18 @@ if hiera('step') >= 5 {
} }
# Glance # Glance
if $glance_backend == 'file' and hiera('glance_file_pcmk_manage', false) {
$secontext = 'context="system_u:object_r:glance_var_lib_t:s0"'
pacemaker::resource::filesystem { 'glance-fs':
device => hiera('glance_file_pcmk_device'),
directory => hiera('glance_file_pcmk_directory'),
fstype => hiera('glance_file_pcmk_fstype'),
fsoptions => join([$secontext, hiera('glance_file_pcmk_options', '')],','),
verify_on_create => true,
clone_params => '',
}
}
pacemaker::resource::service { $::glance::params::registry_service_name : pacemaker::resource::service { $::glance::params::registry_service_name :
clone_params => 'interleave=true', clone_params => 'interleave=true',
require => Pacemaker::Resource::Ocf['openstack-core'], require => Pacemaker::Resource::Ocf['openstack-core'],