diff --git a/manifests/init.pp b/manifests/init.pp
index 501d106b..6fb565a5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -133,7 +133,7 @@
 #
 # [*storage_availability_zone*]
 #   (optional) Availability zone of the node.
-#   Defaults to 'nova'
+#   Defaults to $facts['os_service_default']
 #
 # [*rootwrap_config*]
 #   (optional) Path to the rootwrap configuration file to use for
@@ -232,7 +232,7 @@ class manila (
   $cert_file                          = $facts['os_service_default'],
   $key_file                           = $facts['os_service_default'],
   $api_paste_config                   = '/etc/manila/api-paste.ini',
-  $storage_availability_zone          = 'nova',
+  $storage_availability_zone          = $facts['os_service_default'],
   $rootwrap_config                    = '/etc/manila/rootwrap.conf',
   $state_path                         = '/var/lib/manila',
   $lock_path                          = $::manila::params::lock_path,
diff --git a/spec/classes/manila_init_spec.rb b/spec/classes/manila_init_spec.rb
index b38d9c33..d3cb0b4e 100644
--- a/spec/classes/manila_init_spec.rb
+++ b/spec/classes/manila_init_spec.rb
@@ -50,7 +50,7 @@ describe 'manila' do
           :enable_cancel_on_failover       => '<SERVICE DEFAULT>',
         )
         is_expected.to contain_manila_config('DEFAULT/storage_availability_zone').with(
-          :value => 'nova'
+          :value => '<SERVICE DEFAULT>'
         )
         is_expected.to contain_manila_config('DEFAULT/api_paste_config').with(
           :value => '/etc/manila/api-paste.ini'