Merge "Disable Sensu support by default"
diff --git a/README.rst b/README.rst
index 3296d86..971f76c 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 e7d87c3..24aed63 100644
--- a/cinder/files/mitaka/cinder.conf.controller.Debian
+++ b/cinder/files/mitaka/cinder.conf.controller.Debian
@@ -4,6 +4,13 @@
rootwrap_config = /etc/cinder/rootwrap.conf
api_paste_confg = /etc/cinder/api-paste.ini
+{%- if controller.public_endpoint_address is defined %}
+
+public_endpoint = {{ controller.public_endpoint_address }}
+osapi_volume_base_URL = {{ controller.public_endpoint_address }}
+
+{%- endif %}
+
iscsi_helper = tgtadm
volume_name_template = volume-%s
#volume_group = cinder
@@ -22,6 +29,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 3998c7b..528d8a6 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 3998c7b..528d8a6 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