diff options
| author | Dave Walker (Daviey) <email@daviey.com> | 2016-06-25 22:59:46 +0100 |
|---|---|---|
| committer | Dave Walker (Daviey) <email@daviey.com> | 2016-06-25 23:19:26 +0100 |
| commit | d5d04587f12e6632df5879b33adf1666914e1764 (patch) | |
| tree | ad0641e238374d4f7173b20602f0f0c27686c83f | |
| parent | b6e51e9531caaa6bda58de5c91e288763c588de2 (diff) | |
| download | kolla-d5d04587f12e6632df5879b33adf1666914e1764.tar.gz kolla-d5d04587f12e6632df5879b33adf1666914e1764.zip | |
Revert "Fix radosgw 'rgw frontends' param"
The original commit changes ceph-rgw to listen on all
addresses (0.0.0.0:6780), which means that it listens on
both the storage_interface address and the VIP.
This makes it incompatible with having HAProxy on the same
host.
This reverts commit 819ae24b50ffda74e5b3a72f4c26321e7c9696cb.
Change-Id: I6cba31cc942a0be9f65d2f4847c8c2bc364a9c1e
Closes-Bug: 1596229
Signed-off-by: Dave Walker (Daviey) <email@daviey.com>
| -rw-r--r-- | ansible/roles/ceph/templates/ceph.conf.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/ceph/templates/ceph.conf.j2 b/ansible/roles/ceph/templates/ceph.conf.j2 index 12a6b3737..ea92c9b5f 100644 --- a/ansible/roles/ceph/templates/ceph.conf.j2 +++ b/ansible/roles/ceph/templates/ceph.conf.j2 @@ -24,5 +24,5 @@ mon compact on start = true host = {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }} keyring = /etc/ceph/ceph.client.radosgw.keyring log file = /var/log/kolla/ceph/client.radosgw.gateway.log -rgw frontends = civetweb port={{ rgw_port }} +rgw frontends = civetweb port={{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}:{{ rgw_port }} {% endif %} |