fixed ceph.conf newline issue and get_host_ip()

hooks/utils.py

@@ -70,10 +70,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)

templates/ceph.conf

@@ -30,4 +30,5 @@
 [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
+