Merge pull request #13 from dukov/master
Policy.json should be defined by user
diff --git a/README.rst b/README.rst
index 4cdd914..d42a2c6 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
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 6be4290..5ceec61 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -6,7 +6,7 @@
heka:
enabled: true
sensu:
- enabled: true
+ enabled: false
sphinx:
enabled: true
config:
diff --git a/metadata/service/volume/local.yml b/metadata/service/volume/local.yml
new file mode 100644
index 0000000..592f010
--- /dev/null
+++ b/metadata/service/volume/local.yml
@@ -0,0 +1,44 @@
+applications:
+- cinder
+classes:
+- service.cinder.support
+parameters:
+ _param:
+ keystone_cinder_endpoint_type: internalURL
+ cinder:
+ volume:
+ enabled: true
+ version: ${_param:cinder_version}
+ osapi:
+ host: ${_param:cluster_local_address}
+ database:
+ engine: mysql
+ host: ${_param:single_address}
+ port: 3306
+ name: cinder
+ user: cinder
+ password: ${_param:mysql_cinder_password}
+ identity:
+ engine: keystone
+ region: RegionOne
+ host: ${_param:single_address}
+ port: 35357
+ tenant: service
+ user: cinder
+ password: ${_param:keystone_cinder_password}
+ endpoint_type: ${_param:keystone_cinder_endpoint_type}
+ glance:
+ host: ${_param:single_address}
+ port: 9292
+ message_queue:
+ engine: rabbitmq
+ host: ${_param:single_address}
+ port: 5672
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
+ cache:
+ engine: memcached
+ members:
+ host: ${_param:single_address}
+