Merge lp:~bigdata-dev/charms/trusty/hdp-storm/trunk into lp:charms/trusty/hdp-storm

[Charles Butler]

Includes amir's openstack changes

[Kevin W Monroe (kwmonroe)]

+1 Chuck, LGTM.

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-09-03 04:10:49 +0000
+++ hooks/common.py	2014-12-09 20:28:56 +0000
@@ -8,3 +8,4 @@
 storm_yaml_path = os.path.join(os.path.sep, storm_conf_path, 'storm.yaml')
 storm_local_dir = os.path.join(os.path.sep, 'tmp', 'storm', 'local')
 storm_data_dir = os.path.join(os.path.sep, 'home', 'storm')
+hosts_path = os.path.join(os.path.sep, 'etc', 'hosts')
 
=== modified file 'hooks/install'
--- hooks/install	2014-09-03 04:10:49 +0000
+++ hooks/install	2014-12-09 20:28:56 +0000
@@ -8,6 +8,7 @@
 from bdutils import setDirPermission, fileSetKV
 from shutil import copy
 from charmhelpers.core.hookenv import open_port
+from charmhelpers.lib.utils import get_unit_hostname 
 
 sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
 
@@ -42,7 +43,7 @@
     open_port(8081)
     open_port(8080)
     open_port(6627)
-
+    fileSetKV(com.hosts_path, hookenv.unit_get('private-address')+' ', get_unit_hostname())
 
 if __name__ == "__main__":
     # execute a hook based on the name the program is called by
 
=== modified file 'hooks/nimbus-relation-joined'
--- hooks/nimbus-relation-joined	2014-09-03 17:52:32 +0000
+++ hooks/nimbus-relation-joined	2014-12-09 20:28:56 +0000
@@ -7,6 +7,7 @@
 import common as com
 from bdutils import fileGetKV, fileSetKV, mergeFiles, is_jvm_service_active
 from shutil import copy
+from charmhelpers.lib.utils import get_unit_hostname 
 
 sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
 
@@ -24,14 +25,14 @@
 @hooks.hook('nimbus-relation-joined')
 def nimbus_relation_joined():
     log('nimbus-relation-joined called')
-    master_hostname = hookenv.unit_private_ip()
+    master_ip = hookenv.unit_private_ip()
     if not is_jvm_service_active("nimbus"):
         mergeFiles(com.supervisord_conf_file, com.nimbus_supervisord_conf)
-        log('nimbus-relation-joined nimbus_hostname={}'.format(master_hostname))
-        fileSetKV(com.storm_yaml_path, "nimbus.host:", " \""+master_hostname+"\"")
-        fileSetKV(com.storm_yaml_path, "drpc.servers:", "\n- \""+master_hostname+"\"")
+        log('nimbus-relation-joined nimbus_ip={}'.format(master_ip))
+        fileSetKV(com.storm_yaml_path, "nimbus.host:", " \""+master_ip+"\"")
+        fileSetKV(com.storm_yaml_path, "drpc.servers:", "\n- \""+master_ip+"\"")
         host.service_restart("supervisor")
-    relation_set(nimbus_hostname = master_hostname)
+    relation_set(nimbus_hostname = get_unit_hostname())
     relation_set(nimbus_ready = 'Ready')
     
 
 
=== modified file 'hooks/slave-relation-changed'
--- hooks/slave-relation-changed	2014-09-03 04:10:49 +0000
+++ hooks/slave-relation-changed	2014-12-09 20:28:56 +0000
@@ -26,11 +26,14 @@
     if nimbusReady !='Ready':
         sys.exit(0)
     nimbus_hostname = relation_get('nimbus_hostname')
+    nimbus_ip = relation_get('private-address')
     #copy(com.slave_supervisord_conf, com.supervisord_conf_file)
     mergeFiles(com.supervisord_conf_file, com.slave_supervisord_conf)
-    log('nimbus-relation-joined nimbus_hostname={}'.format(nimbus_hostname))
-    fileSetKV(com.storm_yaml_path, "nimbus.host:", " \""+nimbus_hostname+"\"")
-    fileSetKV(com.storm_yaml_path, "drpc.servers:", "\n- \""+nimbus_hostname+"\"")
+    log('nimbus-relation-joined nimbus_ip={}'.format(nimbus_ip))
+    fileSetKV(com.storm_yaml_path, "nimbus.host:", " \""+nimbus_ip+"\"")
+    fileSetKV(com.storm_yaml_path, "drpc.servers:", "\n- \""+nimbus_ip+"\"")
+    fileSetKV(com.hosts_path, nimbus_ip+' ', nimbus_hostname)
+
     host.service_restart("supervisor")
     
 
 
=== modified file 'tests/storm.yaml'
--- tests/storm.yaml	2014-09-18 00:19:05 +0000
+++ tests/storm.yaml	2014-12-09 20:28:56 +0000
@@ -1,19 +1,19 @@
 hdp-storm-cluster: 
   services: 
     "hdp-zookeeper": 
-      charm: "cs:~asanjar/trusty/hdp-zookeeper"
+      charm: "cs:trusty/hdp-zookeeper"
       num_units: 3
       annotations: 
         "gui-x": "466.40822141386604"
         "gui-y": "248.59259441628797"
     "nimbus-server": 
-      charm: "cs:~asanjar/trusty/hdp-storm"
+      charm: "hdp-storm"
       num_units: 1
       annotations: 
         "gui-x": "947.5838407971116"
         "gui-y": "526.3994677946897"
     "storm-worker": 
-      charm: "cs:~asanjar/trusty/hdp-storm"
+      charm: "hdp-storm"
       num_units: 1
       annotations: 
         "gui-x": "950.2287444616625"