1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109 | commit 94019995609f56905ad303924f9af0101a6f1773
Author: James Page <james.page@canonical.com>
Date: Wed Sep 25 21:53:17 2013 +0100
Update templates for havana, drop s3_token auth for the interim
diff --git a/templates/havana b/templates/havana
deleted file mode 120000
index cb444ed..0000000
--- a/templates/havana
+++ /dev/null
@@ -1 +0,0 @@
-grizzly/
\ No newline at end of file
diff --git a/templates/havana/memcached.conf b/templates/havana/memcached.conf
new file mode 120000
index 0000000..55feb6b
--- /dev/null
+++ b/templates/havana/memcached.conf
@@ -0,0 +1 @@
+../essex/memcached.conf
\ No newline at end of file
diff --git a/templates/havana/proxy-server.conf b/templates/havana/proxy-server.conf
new file mode 100644
index 0000000..b248113
--- /dev/null
+++ b/templates/havana/proxy-server.conf
@@ -0,0 +1,65 @@
+[DEFAULT]
+bind_port = {{ bind_port }}
+workers = {{ workers }}
+user = swift
+{% if ssl %}
+cert_file = {{ ssl_cert }}
+key_file = {{ ssl_key }}
+{% endif %}
+
+{% if auth_type == 'keystone' %}
+[pipeline:main]
+pipeline = healthcheck cache swift3 authtoken keystoneauth proxy-server
+{% else %}
+[pipeline:main]
+pipeline = healthcheck cache tempauth proxy-server
+{% endif %}
+
+[app:proxy-server]
+use = egg:swift#proxy
+allow_account_management = true
+{% if auth_type == 'keystone' %}account_autocreate = true{% endif %}
+
+[filter:tempauth]
+use = egg:swift#tempauth
+user_system_root = testpass .admin https://{{ proxy_ip }}:8080/v1/AUTH_system
+
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
+[filter:cache]
+use = egg:swift#memcache
+memcache_servers = {{ proxy_ip }}:11211
+
+{% if auth_type == 'keystone' %}
+[filter:keystoneauth]
+use = egg:swift#keystoneauth
+operator_roles = {{ operator_roles }}
+
+[filter:authtoken]
+paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
+auth_host = {{ keystone_host }}
+auth_port = {{ auth_port }}
+auth_protocol = {{ auth_protocol }}
+auth_uri = {{ auth_protocol }}://{{ keystone_host }}:{{ service_port }}
+admin_tenant_name = {{ service_tenant }}
+admin_user = {{ service_user }}
+admin_password = {{ service_password }}
+delay_auth_decision = {{ delay_auth_decision|lower }}
+{% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}
+cache = swift.cache
+
+#[filter:s3token]
+#paste.filter_factory = keystoneclient.middleware.s3_token:filter_factory
+#service_host = {{ keystone_host }}
+#service_port = {{ service_port }}
+#auth_port = {{ auth_port }}
+#auth_host = {{ keystone_host }}
+#auth_protocol = {{ auth_protocol }}
+#auth_token = {{ admin_token }}
+#admin_token = {{ admin_token }}
+
+[filter:swift3]
+{% if os_release == 'essex' %}use = egg:swift#swift3{% else %}use = egg:swift3#swift3
+{% endif %}
+{% endif %}
diff --git a/templates/havana/swift-rings b/templates/havana/swift-rings
new file mode 120000
index 0000000..4a86480
--- /dev/null
+++ b/templates/havana/swift-rings
@@ -0,0 +1 @@
+../essex/swift-rings
\ No newline at end of file
diff --git a/templates/havana/swift.conf b/templates/havana/swift.conf
new file mode 120000
index 0000000..9f252b6
--- /dev/null
+++ b/templates/havana/swift.conf
@@ -0,0 +1 @@
+../essex/swift.conf
\ No newline at end of file
|