Update to latest refs
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
parent
5beaf07f2f
commit
c27e90ab06
@ -8,10 +8,10 @@ fixtures:
|
||||
ref: '77dbc80de15b5ef02a5e89c8ef040e70df576a1d'
|
||||
'nova':
|
||||
repo: 'git://github.com/enovance/puppet-nova.git'
|
||||
ref: '1e77a9d48a85a3ae6d30993b3c887f58e4a5973c'
|
||||
ref: '0249428f294217c2ad5fb75f8d0a0bafac12fe9c'
|
||||
'glance':
|
||||
repo: 'git://github.com/enovance/puppet-glance.git'
|
||||
ref: 'f3bbfd9efcc2436d6ed4beca87d62168bb109453'
|
||||
ref: '8156a87cd04943904258d572e47838d0c346654f'
|
||||
'horizon':
|
||||
repo: 'git://github.com/enovance/puppet-horizon'
|
||||
ref: '36383e90d1c4013d7989561b00ffcb08c76908de'
|
||||
|
@ -25,7 +25,7 @@ mod 'cinder',
|
||||
:ref => 'eccaa59fb9635c62d108029e797388d456e8f6c2'
|
||||
mod 'glance',
|
||||
:git => 'git://github.com/enovance/puppet-glance.git',
|
||||
:ref => 'f3bbfd9efcc2436d6ed4beca87d62168bb109453'
|
||||
:ref => '8156a87cd04943904258d572e47838d0c346654f'
|
||||
mod 'heat',
|
||||
:git => 'git://github.com/enovance/puppet-heat.git',
|
||||
:ref => '17736b2fd726858cb83590f8a8b1d594a087ea44'
|
||||
@ -40,7 +40,7 @@ mod 'neutron',
|
||||
:ref => '66c436bc2f06c5a71d79c674697394a11ec227f9'
|
||||
mod 'nova',
|
||||
:git => 'git://github.com/enovance/puppet-nova.git',
|
||||
:ref => '1e77a9d48a85a3ae6d30993b3c887f58e4a5973c'
|
||||
:ref => '0249428f294217c2ad5fb75f8d0a0bafac12fe9c'
|
||||
mod 'swift',
|
||||
:git => 'git://github.com/enovance/puppet-swift.git',
|
||||
:ref => '9874edd2655e122bf8bd3eedc70e697bc5b83326'
|
||||
|
@ -92,7 +92,12 @@ class cloud::volume(
|
||||
log_dir => $log_dir,
|
||||
log_facility => $log_facility,
|
||||
use_syslog => $use_syslog,
|
||||
storage_availability_zone => $storage_availability_zone
|
||||
# https://review.openstack.org/#/c/92993/
|
||||
# storage_availability_zone => $storage_availability_zone
|
||||
}
|
||||
|
||||
cinder_config {
|
||||
'DEFAULT/storage_availability_zone': value => $storage_availability_zone
|
||||
}
|
||||
|
||||
class { 'cinder::ceilometer': }
|
||||
|
@ -60,7 +60,7 @@ describe 'cloud::volume::controller' do
|
||||
:log_facility => 'LOG_LOCAL0',
|
||||
:use_syslog => true,
|
||||
:log_dir => false,
|
||||
:storage_availability_zone => 'nova'
|
||||
# :storage_availability_zone => 'nova'
|
||||
)
|
||||
should contain_class('cinder::ceilometer')
|
||||
end
|
||||
|
@ -74,7 +74,7 @@ describe 'cloud::volume::storage' do
|
||||
:log_facility => 'LOG_LOCAL0',
|
||||
:use_syslog => true,
|
||||
:log_dir => false,
|
||||
:storage_availability_zone => 'nova'
|
||||
# :storage_availability_zone => 'nova'
|
||||
)
|
||||
|
||||
should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier')
|
||||
|
Loading…
x
Reference in New Issue
Block a user