openstack
/
fuel-library
Code Issues Proposed changes

Remove workaround for resume_guests option 

Also reference for nova was updated in order to get
commit with resume_guest from stable branch.

Change-Id: Ib3100f17d17fca7fe948cfff2b6b8500be18b322
Closes-Bug: #1651101
(cherry picked from commit a5b336a50c)
This commit is contained in:
Mykyta Karpin 2016-12-26 17:10:25 +02:00
parent 9b58bbfad1
commit 01ece1ba1e
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack_tasks/Puppetfile
View File

@ -79,7 +79,7 @@ mod 'neutron',
# Pull in puppet-nova
mod 'nova',
:git => 'https://github.com/fuel-infra/puppet-nova.git',
:ref => '238fe9e0a0bc9fdd99880cead15122310bf4586c'
:ref => 'd31f0be1095cffba9cc004b5324766eefd5e336a'
# Pull in puppet-murano
mod 'murano',

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

@ -314,19 +314,20 @@ class openstack_tasks::roles::compute {
# after the deployment is done.
# NOTE(bogdando) This maybe be changed, if the host aggregates implemented, bp disable-new-computes
class { '::nova::compute':
enabled => false,
vncserver_proxyclient_address => get_network_role_property('nova/api', 'ipaddr'),
vncproxy_protocol => $vncproxy_protocol,
vncproxy_host => $vncproxy_host,
vncproxy_port => $nova_hash_real['vncproxy_port'],
force_config_drive => $force_config_drive,
pci_passthrough => nic_whitelist_to_json(get_nic_passthrough_whitelist('sriov')),
instance_usage_audit => $instance_usage_audit,
instance_usage_audit_period => $instance_usage_audit_period,
reserved_host_memory => $nova_hash_real['reserved_host_memory'],
config_drive_format => $config_drive_format,
allow_resize_to_same_host => true,
vcpu_pin_set => $nova_hash_real['cpu_pinning'],
enabled => false,
vncserver_proxyclient_address => get_network_role_property('nova/api', 'ipaddr'),
vncproxy_protocol => $vncproxy_protocol,
vncproxy_host => $vncproxy_host,
vncproxy_port => $nova_hash_real['vncproxy_port'],
force_config_drive => $force_config_drive,
pci_passthrough => nic_whitelist_to_json(get_nic_passthrough_whitelist('sriov')),
instance_usage_audit => $instance_usage_audit,
instance_usage_audit_period => $instance_usage_audit_period,
reserved_host_memory => $nova_hash_real['reserved_host_memory'],
config_drive_format => $config_drive_format,
allow_resize_to_same_host => true,
vcpu_pin_set => $nova_hash_real['cpu_pinning'],
resume_guests_state_on_host_boot => hiera('resume_guests_state_on_host_boot', 'False'),
}
nova_config {
@ -342,17 +343,6 @@ 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;

10
tests/noop/spec/hosts/roles/compute_spec.rb
View File

@ -69,6 +69,8 @@ describe manifest do
let(:rabbit_hash) { Noop.hiera_structure 'rabbit', {} }
let(:resume_guests_state_on_host_boot) { Noop.hiera 'resume_guests_state_on_host_boot', 'False' }
# Legacy openstack-compute tests
if ironic_enabled
@ -374,6 +376,14 @@ describe manifest do
)
end
it 'should properly configure resuming guests on host boot' do
should contain_class('nova::compute').with(
'resume_guests_state_on_host_boot' => resume_guests_state_on_host_boot
)
should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with(
'value' => resume_guests_state_on_host_boot)
end
it 'should properly configure glance api servers with (non-)ssl' do
should contain_class('nova').with(
'glance_api_servers' => glance_api_servers