volume: AZ support
Bring storage_availability_zone support.
This commit is contained in:
		@@ -66,6 +66,7 @@ class cloud::volume(
 | 
			
		||||
  $verbose                    = true,
 | 
			
		||||
  $debug                      = true,
 | 
			
		||||
  $log_facility               = 'LOG_LOCAL0',
 | 
			
		||||
  $storage_availability_zone  = 'nova',
 | 
			
		||||
  $use_syslog                 = true
 | 
			
		||||
) {
 | 
			
		||||
 | 
			
		||||
@@ -90,7 +91,8 @@ class cloud::volume(
 | 
			
		||||
    debug                     => $debug,
 | 
			
		||||
    log_dir                   => $log_dir,
 | 
			
		||||
    log_facility              => $log_facility,
 | 
			
		||||
    use_syslog          => $use_syslog
 | 
			
		||||
    use_syslog                => $use_syslog,
 | 
			
		||||
    storage_availability_zone => $storage_availability_zone
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  class { 'cinder::ceilometer': }
 | 
			
		||||
 
 | 
			
		||||
@@ -32,6 +32,7 @@ describe 'cloud::volume::controller' do
 | 
			
		||||
        verbose                    => true,
 | 
			
		||||
        debug                      => true,
 | 
			
		||||
        log_facility               => 'LOG_LOCAL0',
 | 
			
		||||
        storage_availability_zone  => 'nova',
 | 
			
		||||
        use_syslog                 => true }"
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
@@ -58,7 +59,8 @@ describe 'cloud::volume::controller' do
 | 
			
		||||
          :rabbit_virtual_host       => '/',
 | 
			
		||||
          :log_facility              => 'LOG_LOCAL0',
 | 
			
		||||
          :use_syslog                => true,
 | 
			
		||||
          :log_dir                 => false
 | 
			
		||||
          :log_dir                   => false,
 | 
			
		||||
          :storage_availability_zone => 'nova'
 | 
			
		||||
        )
 | 
			
		||||
      should contain_class('cinder::ceilometer')
 | 
			
		||||
    end
 | 
			
		||||
 
 | 
			
		||||
@@ -32,6 +32,7 @@ describe 'cloud::volume::storage' do
 | 
			
		||||
        verbose                    => true,
 | 
			
		||||
        debug                      => true,
 | 
			
		||||
        log_facility               => 'LOG_LOCAL0',
 | 
			
		||||
        storage_availability_zone  => 'nova',
 | 
			
		||||
        use_syslog                 => true }"
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
@@ -72,7 +73,8 @@ describe 'cloud::volume::storage' do
 | 
			
		||||
          :rabbit_virtual_host       => '/',
 | 
			
		||||
          :log_facility              => 'LOG_LOCAL0',
 | 
			
		||||
          :use_syslog                => true,
 | 
			
		||||
          :log_dir                 => false
 | 
			
		||||
          :log_dir                   => false,
 | 
			
		||||
          :storage_availability_zone => 'nova'
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
      should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier')
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user