stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge "Backport VNC fix"

Browse Source
This commit is contained in:
Jenkins
2015-06-17 00:40:30 +00:00
committed by Gerrit Code Review
parent 1b6bd9247f c751451dd7
commit ee2a116ad8
9 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Puppetfile
View File

@@ -43,7 +43,7 @@ mod 'neutron',
:ref => 'd5628a9ca16140e3c08c98d56feecaf56e898f35' :ref => 'd5628a9ca16140e3c08c98d56feecaf56e898f35'
mod 'nova', mod 'nova',
:git => 'git://github.com/enovance/puppet-nova.git', :git => 'git://github.com/enovance/puppet-nova.git',
:ref => '43ad85285634f75e8faf082981416ca12c4e3ff3' :ref => 'cc1a2a348a7953298c75881a5c4afafeb3d0a4e4'
mod 'swift', mod 'swift',
:git => 'git://github.com/enovance/puppet-swift.git', :git => 'git://github.com/enovance/puppet-swift.git',
:ref => '1e4ebee1e88f946dfe4ed078437dc20b28698b53' :ref => '1e4ebee1e88f946dfe4ed078437dc20b28698b53'

1
manifests/compute.pp
View File

@@ -185,7 +185,6 @@ class cloud::compute(
nova_config { nova_config {
'DEFAULT/resume_guests_state_on_host_boot': value => true; 'DEFAULT/resume_guests_state_on_host_boot': value => true;
'DEFAULT/default_availability_zone': value => $availability_zone;
'DEFAULT/servicegroup_driver': value => 'mc'; 'DEFAULT/servicegroup_driver': value => 'mc';
'DEFAULT/glance_num_retries': value => '10'; 'DEFAULT/glance_num_retries': value => '10';
'DEFAULT/cinder_catalog_info': value => "volume:cinder:${cinder_endpoint_type}"; 'DEFAULT/cinder_catalog_info': value => "volume:cinder:${cinder_endpoint_type}";

3
manifests/compute/hypervisor.pp
View File

@@ -268,7 +268,8 @@ Host *
vncproxy_protocol => $ks_console_public_proto, vncproxy_protocol => $ks_console_public_proto,
vncproxy_port => $novnc_port, vncproxy_port => $novnc_port,
virtio_nic => false, virtio_nic => false,
neutron_enabled => true neutron_enabled => true,
default_availability_zone => $::cloud::compute::availability_zone,
} }
if $::osfamily == 'RedHat' { if $::osfamily == 'RedHat' {

1
spec/classes/cloud_compute_api_spec.rb
View File

@@ -74,7 +74,6 @@ describe 'cloud::compute::api' do
:database_idle_timeout => '5000', :database_idle_timeout => '5000',
) )
is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
is_expected.to contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
is_expected.to contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc') is_expected.to contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
is_expected.to contain_nova_config('DEFAULT/glance_num_retries').with_value('10') is_expected.to contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end end

1
spec/classes/cloud_compute_cert_spec.rb
View File

@@ -62,7 +62,6 @@ describe 'cloud::compute::cert' do
:database_idle_timeout => '5000', :database_idle_timeout => '5000',
) )
is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
is_expected.to contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
is_expected.to contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc') is_expected.to contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
is_expected.to contain_nova_config('DEFAULT/glance_num_retries').with_value('10') is_expected.to contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end end

1
spec/classes/cloud_compute_conductor_spec.rb
View File

@@ -62,7 +62,6 @@ describe 'cloud::compute::conductor' do
:database_idle_timeout => '5000', :database_idle_timeout => '5000',
) )
is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
is_expected.to contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
is_expected.to contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc') is_expected.to contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
is_expected.to contain_nova_config('DEFAULT/glance_num_retries').with_value('10') is_expected.to contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end end

1
spec/classes/cloud_compute_consoleauth_spec.rb
View File

@@ -62,7 +62,6 @@ describe 'cloud::compute::consoleauth' do
:database_idle_timeout => '5000', :database_idle_timeout => '5000',
) )
is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
is_expected.to contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
is_expected.to contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc') is_expected.to contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
is_expected.to contain_nova_config('DEFAULT/glance_num_retries').with_value('10') is_expected.to contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end end

1
spec/classes/cloud_compute_consoleproxy_spec.rb
View File

@@ -66,7 +66,6 @@ describe 'cloud::compute::consoleproxy' do
:database_idle_timeout => '5000', :database_idle_timeout => '5000',
) )
is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
is_expected.to contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
is_expected.to contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc') is_expected.to contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
is_expected.to contain_nova_config('DEFAULT/glance_num_retries').with_value('10') is_expected.to contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end end

1
spec/classes/cloud_compute_scheduler_spec.rb
View File

@@ -68,7 +68,6 @@ describe 'cloud::compute::scheduler' do
:database_idle_timeout => '5000', :database_idle_timeout => '5000',
) )
is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
is_expected.to contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
is_expected.to contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc') is_expected.to contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
is_expected.to contain_nova_config('DEFAULT/glance_num_retries').with_value('10') is_expected.to contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end end