openstack/charm-ceph-proxy
Code Issues Proposed changes

fixed ceph.conf newline issue and get_host_ip()

Browse Source
This commit is contained in:
Edward Hope-Morley 2014-09-24 14:28:44 +01:00
parent 720bfb06e9
commit de145be2dd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/utils.py
View File

@ -71,10 +71,10 @@ def get_unit_hostname():
@cached
def get_host_ip(hostname=None):
hostname = hostname or unit_get('private-address')
if config('prefer-ipv6'):
return hostname or get_ipv6_addr()[0]
hostname = hostname or unit_get('private-address')
try:
# Test to see if already an IPv4 address
socket.inet_aton(hostname)

2
templates/ceph.conf
View File

@ -31,4 +31,4 @@ keyring = /var/lib/ceph/mds/$cluster-$id/keyring
[osd]
keyring = /var/lib/ceph/osd/$cluster-$id/keyring
osd journal size = {{ osd_journal_size }}
filestore xattr use omap = true
filestore xattr use omap = true