diff --git a/README.rst b/README.rst
index 72b2f4e..2ca9873 100644
--- a/README.rst
+++ b/README.rst
@@ -19,6 +19,7 @@
         enabled: true
         version: juno
         default_volume_type: 7k2SaS
+        availability_zone_fallback: True
         database:
           engine: mysql
           host: 127.0.0.1
diff --git a/cinder/files/mitaka/cinder.conf.controller.Debian b/cinder/files/mitaka/cinder.conf.controller.Debian
index 6ce59df..0e68e26 100644
--- a/cinder/files/mitaka/cinder.conf.controller.Debian
+++ b/cinder/files/mitaka/cinder.conf.controller.Debian
@@ -22,6 +22,7 @@
 debug=False
 
 os_region_name={{ controller.identity.region }}
+allow_availability_zone_fallback = {{ controller.get('availability_zone_fallback', True) }}
 
 #glance_api_ssl_compression=False
 #glance_api_insecure=False
diff --git a/cinder/files/newton/cinder.conf.controller.Debian b/cinder/files/newton/cinder.conf.controller.Debian
index 5b9df11..d4965f1 100644
--- a/cinder/files/newton/cinder.conf.controller.Debian
+++ b/cinder/files/newton/cinder.conf.controller.Debian
@@ -22,6 +22,7 @@
 debug=False
 
 os_region_name={{ controller.identity.region }}
+allow_availability_zone_fallback = {{ controller.get('availability_zone_fallback', True) }}
 
 #glance_api_ssl_compression=False
 #glance_api_insecure=False
diff --git a/cinder/files/ocata/cinder.conf.controller.Debian b/cinder/files/ocata/cinder.conf.controller.Debian
index 5b9df11..d4965f1 100644
--- a/cinder/files/ocata/cinder.conf.controller.Debian
+++ b/cinder/files/ocata/cinder.conf.controller.Debian
@@ -22,6 +22,7 @@
 debug=False
 
 os_region_name={{ controller.identity.region }}
+allow_availability_zone_fallback = {{ controller.get('availability_zone_fallback', True) }}
 
 #glance_api_ssl_compression=False
 #glance_api_insecure=False