Merge lp:~ivoks/charms/trusty/contrail-configuration/host-private-address into lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk

[Ante Karamatić]

Kafka, cassandra and zookeeper now support defining network that they should bind to. Those should be used by Contrail services if they are defined.

[Robert Ayres (robert-ayres)]

review: Approve

=== modified file 'hooks/contrail_configuration_utils.py'
--- hooks/contrail_configuration_utils.py	2016-07-29 05:22:31 +0000
+++ hooks/contrail_configuration_utils.py	2016-09-05 15:43:14 +0000
@@ -127,7 +127,9 @@
     return 8082
 
 def cassandra_ctx():
-    servers = [ gethostbyname(relation_get("private-address", unit, rid))
+    servers = [ (relation_get("host", unit, rid) if
+                relation_get("host", unit, rid) is not None else
+                gethostbyname(relation_get("private-address", unit, rid)))
                 + ":" + (rpc_port if rpc_port else port)
                 for rid in relation_ids("cassandra")
                 for unit, rpc_port, port in
@@ -518,7 +520,9 @@
     render("vnc_api_lib.ini", "/etc/contrail/vnc_api_lib.ini", ctx)
 
 def zookeeper_ctx():
-    return { "zk_servers": [ gethostbyname(relation_get("private-address", unit, rid))
+    return { "zk_servers": [ (relation_get("host", unit, rid) if
+                             relation_get("host", unit, rid) is not None else
+                             gethostbyname(relation_get("private-address", unit, rid)))
                              + ":" + port
                              for rid in relation_ids("zookeeper")
                              for unit, port in