Merge "Fix typo in Glance ceph permissions"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgwproxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgwproxy.yml
new file mode 100644
index 0000000..c74228a
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgwproxy.yml
@@ -0,0 +1,26 @@
+parameters:
+ _param:
+ haproxy_radosgw_bind_port: 8080
+ haproxy_radosgw_source_port: 8080
+ haproxy:
+ proxy:
+ listen:
+ radosgw:
+ mode: tcp
+ balance: source
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: ${_param:haproxy_radosgw_bind_port}
+ servers:
+ - name: ${_param:ceph_rgw_node01_hostname}
+ host: ${_param:ceph_rgw_node01_address}
+ port: ${_param:haproxy_radosgw_source_port}
+ params: check
+ - name: ${_param:ceph_rgw_node02_hostname}
+ host: ${_param:ceph_rgw_node02_address}
+ port: ${_param:haproxy_radosgw_source_port}
+ params: check
+ - name: ${_param:ceph_rgw_node03_hostname}
+ host: ${_param:ceph_rgw_node03_address}
+ port: ${_param:haproxy_radosgw_source_port}
+ params: check
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
index cc9f9f8..e5f0e64 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
@@ -34,6 +34,7 @@
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.haproxy.proxy.listen.openstack.nova-placement
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.ceph.rgwproxy
- system.glance.control.storage.ceph
- system.ceph.common.cluster
- cluster.virtual-mcp-pike-dvr-ceph-rgw.ceph.common