openstack
/
fuel-library
Code Issues Proposed changes

Avoid duplicate declaration for resume_guests_state_on_host_boot 

Change-Id: Icf7ee197db7ffe88879b71b88667f5723ccdd975
Related-Bug: #1651101
This commit is contained in:
Mykyta Karpin 2016-12-19 15:05:41 +02:00
parent 01e72de4c8
commit 0a75c40d57
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment/puppet/openstack_tasks/manifests/roles/compute.pp
View File

@ -90,7 +90,6 @@ class openstack_tasks::roles::compute {
ensure_packages('fping')
$nova_config_hash = {
'DEFAULT/resume_guests_state_on_host_boot' => { value => hiera('resume_guests_state_on_host_boot', 'False') },
'DEFAULT/use_cow_images' => { value => hiera('use_cow_images', 'True') },
'libvirt/libvirt_inject_key' => { value => true },
'libvirt/libvirt_inject_password' => { value => true },
@ -342,6 +341,17 @@ class openstack_tasks::roles::compute {
}
}
# TODO (mkarpin): rework this option management once it's available in puppet-nova module (LP #1651101)
if !defined(Nova_config['DEFAULT/resume_guests_state_on_host_boot']) {
nova_config {
'DEFAULT/resume_guests_state_on_host_boot': value => hiera('resume_guests_state_on_host_boot', 'False')
}
} else {
Nova_config<| title == 'DEFAULT/resume_guests_state_on_hosts_boot' |> {
value => hiera('resume_guests_state_on_host_boot', 'False')
}
}
if $use_syslog {
nova_config {
'DEFAULT/use_syslog_rfc_format': value => true;