Merge pull request #570 from talset/master

Resize vm fail with Permission denied
This commit is contained in:
Emilien Macchi
2014-08-08 18:14:37 +02:00
2 changed files with 3 additions and 1 deletions

View File

@@ -125,6 +125,7 @@ class cloud::compute(
log_dir => $log_dir, log_dir => $log_dir,
log_facility => $log_facility, log_facility => $log_facility,
use_syslog => $use_syslog, use_syslog => $use_syslog,
nova_shell => '/bin/bash',
} }
class { 'nova::network::neutron': class { 'nova::network::neutron':

View File

@@ -100,7 +100,8 @@ describe 'cloud::compute::hypervisor' do
:memcached_servers => ['10.0.0.1','10.0.0.2'], :memcached_servers => ['10.0.0.1','10.0.0.2'],
:database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8', :database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8',
:glance_api_servers => 'http://10.0.0.1:9292', :glance_api_servers => 'http://10.0.0.1:9292',
:log_dir => false :log_dir => false,
:nova_shell => '/bin/bash'
) )
should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone') should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')