Merge pull request #28 from juju-solutions/kafka-bind-address-fixed

Kafka bind address fixed
apache · Jul 22, 2016 · 63c8a7c · 63c8a7c
2 parents 7703f9a + 452101e
commit 63c8a7c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/config.yaml b/bigtop-packages/src/charm/kafka/layer-kafka/config.yaml
@@ -0,0 +1,7 @@
+options:
+  bind_addr:
+    default: null
+    type: string
+    description: |
+      IP address of the interface to listen on, if something other than the
+      default is desired.
diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/lib/charms/layer/bigtop_kafka.py b/bigtop-packages/src/charm/kafka/layer-kafka/lib/charms/layer/bigtop_kafka.py
@@ -55,6 +55,9 @@ def configure_kafka(self, zk_units):
             'kafka::server::port': kafka_port,
             'kafka::server::zookeeper_connection_string': zk_connect,
         }
+        bind_addr = hookenv.config().get('bind_addr')
+        if bind_addr:
+            override['kafka::server::bind_addr'] = bind_addr
 
         bigtop = Bigtop()
         bigtop.render_site_yaml(roles=roles, overrides=override)

diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/tests/01-deploy.py b/bigtop-packages/src/charm/kafka/layer-kafka/tests/01-deploy.py
@@ -33,9 +33,14 @@ def setUpClass(cls):
         cls.d.configure('openjdk', {'java-type': 'jdk',
                                     'java-major': '8'})
 
-        cls.d.relate('kafka:zookeeper', 'zk:zkclient')
+        cls.d.relate('kafka:zookeeper', 'zk:zookeeper')
         cls.d.relate('kafka:java', 'openjdk:java')
-        cls.d.relate('zk:java', 'openjdk:java')
+        try:
+            cls.d.relate('zk:java', 'openjdk:java')
+        except ValueError:
+            # No need to related older versions of the zookeeper charm
+            # to java.
+            pass
 
         cls.d.setup(timeout=900)
         cls.d.sentry.wait_for_messages({'kafka': 'ready'}, timeout=1800)
@@ -45,7 +50,7 @@ def test_deploy(self):
         """
         Simple test to make sure the Kafka java process is running.
         """
-        output, retcode = self.unit.run("pgrep -a java")
+        output, retcode = self.kafka.run("pgrep -a java")
         assert 'Kafka' in output, "Kafka daemon is not started"
 
 

diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/tests/02-smoke-test.py b/bigtop-packages/src/charm/kafka/layer-kafka/tests/02-smoke-test.py
@@ -33,9 +33,14 @@ def setUpClass(cls):
         cls.d.configure('openjdk', {'java-type': 'jdk',
                                     'java-major': '8'})
 
-        cls.d.relate('kafka:zookeeper', 'zk:zkclient')
+        cls.d.relate('kafka:zookeeper', 'zk:zookeeper')
         cls.d.relate('kafka:java', 'openjdk:java')
-        cls.d.relate('zk:java', 'openjdk:java')
+        try:
+            cls.d.relate('zk:java', 'openjdk:java')
+        except ValueError:
+            # No need to related older versions of the zookeeper charm
+            # to java.
+            pass
 
         cls.d.setup(timeout=900)
         cls.d.sentry.wait_for_messages({'kafka': 'ready'}, timeout=1800)