diff --git a/Puppetfile b/Puppetfile
index 0a0711c8..65f1e9bf 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -43,7 +43,7 @@ mod 'neutron',
   :ref => 'd5628a9ca16140e3c08c98d56feecaf56e898f35'
 mod 'nova',
   :git => 'git://github.com/enovance/puppet-nova.git',
-  :ref => '43ad85285634f75e8faf082981416ca12c4e3ff3'
+  :ref => 'cc1a2a348a7953298c75881a5c4afafeb3d0a4e4'
 mod 'swift',
   :git => 'git://github.com/enovance/puppet-swift.git',
   :ref => '1e4ebee1e88f946dfe4ed078437dc20b28698b53'
diff --git a/manifests/compute.pp b/manifests/compute.pp
index 00360c1e..5cbdcc83 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -185,7 +185,6 @@ class cloud::compute(
 
   nova_config {
     'DEFAULT/resume_guests_state_on_host_boot': value => true;
-    'DEFAULT/default_availability_zone':        value => $availability_zone;
     'DEFAULT/servicegroup_driver':              value => 'mc';
     'DEFAULT/glance_num_retries':               value => '10';
     'DEFAULT/cinder_catalog_info':              value => "volume:cinder:${cinder_endpoint_type}";
diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp
index 6cb838ec..a04c064b 100644
--- a/manifests/compute/hypervisor.pp
+++ b/manifests/compute/hypervisor.pp
@@ -268,7 +268,8 @@ Host *
     vncproxy_protocol             => $ks_console_public_proto,
     vncproxy_port                 => $novnc_port,
     virtio_nic                    => false,
-    neutron_enabled               => true
+    neutron_enabled               => true,
+    default_availability_zone     => $::cloud::compute::availability_zone,
   }
 
   if $::osfamily == 'RedHat' {
diff --git a/spec/classes/cloud_compute_api_spec.rb b/spec/classes/cloud_compute_api_spec.rb
index 81ae4ab1..ceb05e76 100644
--- a/spec/classes/cloud_compute_api_spec.rb
+++ b/spec/classes/cloud_compute_api_spec.rb
@@ -74,7 +74,6 @@ describe 'cloud::compute::api' do
           :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/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/glance_num_retries').with_value('10')
     end
diff --git a/spec/classes/cloud_compute_cert_spec.rb b/spec/classes/cloud_compute_cert_spec.rb
index 20d042e3..5bc21fb9 100644
--- a/spec/classes/cloud_compute_cert_spec.rb
+++ b/spec/classes/cloud_compute_cert_spec.rb
@@ -62,7 +62,6 @@ describe 'cloud::compute::cert' do
           :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/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/glance_num_retries').with_value('10')
     end
diff --git a/spec/classes/cloud_compute_conductor_spec.rb b/spec/classes/cloud_compute_conductor_spec.rb
index 95991d07..dd17a0e4 100644
--- a/spec/classes/cloud_compute_conductor_spec.rb
+++ b/spec/classes/cloud_compute_conductor_spec.rb
@@ -62,7 +62,6 @@ describe 'cloud::compute::conductor' do
           :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/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/glance_num_retries').with_value('10')
     end
diff --git a/spec/classes/cloud_compute_consoleauth_spec.rb b/spec/classes/cloud_compute_consoleauth_spec.rb
index a1bfc5ea..27cd5364 100644
--- a/spec/classes/cloud_compute_consoleauth_spec.rb
+++ b/spec/classes/cloud_compute_consoleauth_spec.rb
@@ -62,7 +62,6 @@ describe 'cloud::compute::consoleauth' do
           :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/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/glance_num_retries').with_value('10')
     end
diff --git a/spec/classes/cloud_compute_consoleproxy_spec.rb b/spec/classes/cloud_compute_consoleproxy_spec.rb
index f1d73610..953e27c1 100644
--- a/spec/classes/cloud_compute_consoleproxy_spec.rb
+++ b/spec/classes/cloud_compute_consoleproxy_spec.rb
@@ -66,7 +66,6 @@ describe 'cloud::compute::consoleproxy' do
           :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/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/glance_num_retries').with_value('10')
     end
diff --git a/spec/classes/cloud_compute_scheduler_spec.rb b/spec/classes/cloud_compute_scheduler_spec.rb
index a310cf22..1bca9378 100644
--- a/spec/classes/cloud_compute_scheduler_spec.rb
+++ b/spec/classes/cloud_compute_scheduler_spec.rb
@@ -68,7 +68,6 @@ describe 'cloud::compute::scheduler' do
           :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/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/glance_num_retries').with_value('10')
     end