From 8d3300130e41e22962c2f068098251826176c01d Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Sat, 12 Apr 2014 16:29:10 +0100
Subject: [PATCH] Specialize conf files for icehouse

---
 templates/icehouse/glance-api.conf      | 71 +++++++++++++++++++++++++
 templates/icehouse/glance-registry.conf | 19 +++++++
 templates/parts/section-database        |  4 ++
 3 files changed, 94 insertions(+)
 create mode 100644 templates/icehouse/glance-api.conf
 create mode 100644 templates/icehouse/glance-registry.conf
 create mode 100644 templates/parts/section-database

diff --git a/templates/icehouse/glance-api.conf b/templates/icehouse/glance-api.conf
new file mode 100644
index 00000000..e63e6db6
--- /dev/null
+++ b/templates/icehouse/glance-api.conf
@@ -0,0 +1,71 @@
+[DEFAULT]
+verbose = True
+use_syslog = {{ use_syslog }}
+debug = True
+{% if rbd_pool %}
+default_store = rbd
+{% elif swift_store %}
+default_store = swift
+{% else %}
+default_store = file
+{% endif %}
+bind_host = 0.0.0.0
+{% if ext %}
+bind_port = {{ ext }}
+{% elif bind_port %}
+bind_port = {{ bind_port }}
+{% else %}
+bind_port = 9292
+{% endif %}
+log_file = /var/log/glance/api.log
+backlog = 4096
+
+sql_idle_timeout = 3600
+workers = 1
+registry_host = 0.0.0.0
+registry_port = 9191
+registry_client_protocol = http
+
+{% include "parts/rabbitmq" %}
+
+notifier_strategy = rabbit
+filesystem_store_datadir = /var/lib/glance/images/
+
+{% if swift_store %}
+swift_store_auth_version = 2
+swift_store_auth_address = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0/
+swift_store_user = {{ admin_tenant_name }}:{{ admin_user }}
+swift_store_key = {{ admin_password }}
+swift_store_create_container_on_put = True
+swift_store_container = glance
+swift_store_large_object_size = 5120
+swift_store_large_object_chunk_size = 200
+swift_enable_snet = False
+{% endif %}
+
+{% if rbd_pool %}
+rbd_store_ceph_conf = /etc/ceph/ceph.conf
+rbd_store_user = {{ rbd_user }}
+rbd_store_pool = {{ rbd_pool }}
+rbd_store_chunk_size = 8
+{% endif %}
+
+delayed_delete = False
+scrub_time = 43200
+scrubber_datadir = /var/lib/glance/scrubber
+image_cache_dir = /var/lib/glance/image-cache/
+
+[keystone_authtoken]
+auth_host = 127.0.0.1
+auth_port = 35357
+auth_protocol = http
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%
+
+{% if auth_host %}
+[paste_deploy]
+flavor = keystone
+{% endif %}
+
+{% include "parts/section-database" %}
diff --git a/templates/icehouse/glance-registry.conf b/templates/icehouse/glance-registry.conf
new file mode 100644
index 00000000..e1534bdf
--- /dev/null
+++ b/templates/icehouse/glance-registry.conf
@@ -0,0 +1,19 @@
+[DEFAULT]
+verbose = True
+use_syslog = {{ use_syslog }}
+debug = True
+bind_host = 0.0.0.0
+bind_port = 9191
+log_file = /var/log/glance/registry.log
+backlog = 4096
+
+sql_idle_timeout = 3600
+api_limit_max = 1000
+limit_param_default = 25
+
+{% if auth_host %}
+[paste_deploy]
+flavor = keystone
+{% endif %}
+
+{% include "parts/section-database" %}
diff --git a/templates/parts/section-database b/templates/parts/section-database
new file mode 100644
index 00000000..ae4a5ba0
--- /dev/null
+++ b/templates/parts/section-database
@@ -0,0 +1,4 @@
+{% if database_host -%}
+[database]
+connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
+{% endif -%}