diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp
index da228024..a0e7f1ce 100644
--- a/manifests/compute/hypervisor.pp
+++ b/manifests/compute/hypervisor.pp
@@ -37,6 +37,7 @@ class cloud::compute::hypervisor(
   $rbd_user                   = $os_params::cinder_rbd_user,
   $rbd_pool                   = $os_params::cinder_rbd_pool,
   $rbd_secret_uuid            = $os_params::ceph_fsid,
+  $availability_zone          = $os_params::region,
   $has_ceph                   = false
 ) {
 
@@ -121,9 +122,10 @@ Host *
 
     # Extra config for nova-compute
     nova_config {
-      'DEFAULT/libvirt_inject_key':       value => false;
-      'DEFAULT/libvirt_inject_partition': value => '-2';
-      'DEFAULT/live_migration_flag':      value => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST';
+      'DEFAULT/libvirt_inject_key':        value => false;
+      'DEFAULT/libvirt_inject_partition':  value => '-2';
+      'DEFAULT/live_migration_flag':       value => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST';
+      'DEFAULT/default_availability_zone': value => $availability_zone;
     }
 
     File <<| tag == 'ceph_compute_secret_file' |>>
diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb
index 0a6d74ac..c7bd4c81 100644
--- a/spec/classes/cloud_compute_hypervisor_spec.rb
+++ b/spec/classes/cloud_compute_hypervisor_spec.rb
@@ -43,6 +43,7 @@ describe 'cloud::compute::hypervisor' do
 
     let :params do
       { :libvirt_type                         => 'kvm',
+        :availability_zone                    => 'MyZone',
         :server_proxyclient_address           => '7.0.0.1',
         :spice_port                           => '6082',
         :has_ceph                             => true,
@@ -129,6 +130,10 @@ describe 'cloud::compute::hypervisor' do
       should contain_nova_config('DEFAULT/libvirt_images_rbd_ceph_conf').with('value' => '/etc/ceph/ceph.conf')
       should contain_nova_config('DEFAULT/rbd_user').with('value' => 'cinder')
       should contain_nova_config('DEFAULT/rbd_secret_uuid').with('value' => 'secrete')
+    end
+
+    it 'configure nova-conpute with extra parameters' do
+      should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
       should contain_nova_config('DEFAULT/libvirt_inject_key').with('value' => false)
       should contain_nova_config('DEFAULT/libvirt_inject_partition').with('value' => '-2')
       should contain_nova_config('DEFAULT/live_migration_flag').with('value' => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST')