Add private space binding

README.md

@@ -56,3 +56,11 @@ The 'openstack-origin' setting allows Swift to be installed from installation
 repositories and can be used to setup access to the Ubuntu Cloud Archive
 to support installing Swift versions more recent than what is shipped with
 Ubuntu 12.04 (1.4.8).  For more information, see config.yaml.
+
+**Juju Spaces Awareness**
+
+The juju space binding for "private" has been added to the charm to allow
+for override of the unit's default private-address advertised to it's proxy
+relations.  This is done in case swift-storage units are landed on machines
+that have alternative networks defined that are not accessible from the
+swift-proxy units it is to be related with.

hooks/swift_storage_hooks.py

@@ -48,6 +48,7 @@
     relation_set,
     relations_of_type,
     status_set,
+    network_get_primary_address,
 )
 
 from charmhelpers.fetch import (
@@ -156,6 +157,12 @@ def swift_storage_relation_joined(rid=None):
     # Keep a reference of devices we are adding to the ring
     remember_devices(devs)
 
+    # Fix for lp:1697491 - Assign "private" binding to network you
+    # wish to relate with swift-proxy on.  Fails back to unit def.
+    private_binding_address = network_get_primary_address('private')
+    if private_binding_address is not None:
+        rel_settings['private-address'] = private_binding_address
+
     if config('prefer-ipv6'):
         rel_settings['private-address'] = get_ipv6_addr()[0]
 

metadata.yaml

@@ -22,6 +22,8 @@ series:
   - zesty
   - trusty
   - yakkety
+extra-bindings:
+  private:
 provides:
   nrpe-external-master:
     interface: nrpe-external-master