openstack
/
fuel-library
Code Issues Proposed changes

Merge "Make block device mapping timeout configurable"

This commit is contained in:
Jenkins 2015-04-08 16:24:50 +00:00 committed by Gerrit Code Review
parent a9e2af5113 a3322f28b5
commit dee81f2be4
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment/puppet/osnailyfacter/modular/roles/compute.pp
View File

@ -51,6 +51,9 @@ $nova_rate_limits = hiera('nova_rate_limits')
$nova_report_interval = hiera('nova_report_interval')
$nova_service_down_time = hiera('nova_service_down_time')
$block_device_allocate_retries = hiera('block_device_allocate_retries', 300)
$block_device_allocate_retries_interval = hiera('block_device_allocate_retries_interval', 3)
# TODO: openstack_version is confusing, there's such string var in hiera and hardcoded hash
$hiera_openstack_version = hiera('openstack_version')
$openstack_version = {
@ -428,6 +431,10 @@ nova_config { 'libvirt/libvirt_inject_key': value => 'true'}
nova_config { 'libvirt/libvirt_inject_password': value => 'true'}
nova_config { 'libvirt/libvirt_inject_partition': value => '-1'}
# LP: #1280399
nova_config { 'DEFAULT/block_device_allocate_retries': value => $block_device_allocate_retries }
nova_config { 'DEFAULT/block_device_allocate_retries_interval': value => $block_device_allocate_retries_interval }
# Configure monit watchdogs
# FIXME(bogdando) replace service_path and action to systemd, once supported
if $use_monit_real {