Run keystone under apache
Change-Id: I53d8df97f61c80b0bc3a27f70d20d3f61d72f0e0
diff --git a/haproxy/proxy/listen/openstack/keystone.yml b/haproxy/proxy/listen/openstack/keystone/init.yml
similarity index 90%
rename from haproxy/proxy/listen/openstack/keystone.yml
rename to haproxy/proxy/listen/openstack/keystone/init.yml
index 17e537e..4359f60 100644
--- a/haproxy/proxy/listen/openstack/keystone.yml
+++ b/haproxy/proxy/listen/openstack/keystone/init.yml
@@ -3,8 +3,6 @@
proxy:
listen:
keystone_public_api:
- type: openstack-service
- service_name: keystone
binds:
- address: ${_param:cluster_vip_address}
port: 5000
@@ -22,8 +20,6 @@
port: 5000
params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
keystone_admin_api:
- type: openstack-service
- service_name: keystone
binds:
- address: ${_param:cluster_vip_address}
port: 35357
@@ -39,4 +35,4 @@
- name: ctl03
host: ${_param:cluster_node03_address}
port: 35357
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/haproxy/proxy/listen/openstack/keystone/standalone.yml b/haproxy/proxy/listen/openstack/keystone/standalone.yml
new file mode 100644
index 0000000..c454583
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/keystone/standalone.yml
@@ -0,0 +1,12 @@
+classes:
+- system.haproxy.proxy.listen.openstack.keystone
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ keystone_public_api:
+ type: openstack-service
+ service_name: keystone
+ keystone_admin_api:
+ type: openstack-service
+ service_name: keystone
diff --git a/haproxy/proxy/listen/openstack/keystone/wsgi.yml b/haproxy/proxy/listen/openstack/keystone/wsgi.yml
new file mode 100644
index 0000000..efefe8b
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/keystone/wsgi.yml
@@ -0,0 +1,29 @@
+classes:
+- system.haproxy.proxy.listen.openstack.keystone
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ keystone_public_api:
+ mode: http
+ options:
+ - httpchk
+ - httpclose
+ - httplog
+ sticks:
+ - stick on src
+ - stick-table type ip size 200k expire 2m
+ keystone_admin_api:
+ mode: http
+ options:
+ - httpchk
+ - httpclose
+ - httplog
+ sticks:
+ - stick on src
+ - stick-table type ip size 200k expire 2m
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 35357
+ ssl:
+ enabled: false
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index f077faf..54bf75f 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -2,6 +2,7 @@
- service.keystone.server.cluster
- service.keepalived.cluster.single
- system.haproxy.proxy.listen.openstack.keystone
+- system.haproxy.proxy.listen.openstack.keystone.standalone
parameters:
keystone:
server: