Merge lp:~johnsca/charms/trusty/apache-hadoop-yarn-master/etc-hosts-refactor into lp:~bigdata-dev/charms/trusty/apache-hadoop-yarn-master/trunk

[Cory Johns]

Use refactored /etc/hosts handling

[Kevin W Monroe (kwmonroe)]

lgtm, especially the bzr artifacts. merged.

review: Approve

=== modified file 'hooks/common.py'
--- hooks/common.py	2015-05-13 16:48:39 +0000
+++ hooks/common.py	2015-06-19 15:38:13 +0000
@@ -51,6 +51,7 @@
     hs_port = dist_config.port('jh_webapp_http')
     nodemanagers = jujubigdata.relations.ResourceManagerMaster(spec=hadoop.spec, port=port, historyserver_port=hs_port)
     clients = jujubigdata.relations.ResourceManager(spec=hadoop.spec, port=port, historyserver_port=hs_port)
+    namenode = jujubigdata.relations.NameNode(spec=hadoop.client_spec)
     manager = charmframework.Manager([
         {
             'name': 'hadoop-base',
@@ -69,12 +70,13 @@
             ],
             'requires': [
                 hadoop.is_installed,
-                jujubigdata.relations.NameNode(spec=hadoop.client_spec),
+                namenode,
                 jujubigdata.relations.NodeManager(optional=True),
             ],
             'callbacks': [
-                nodemanagers.register_host_ips,
-                jujubigdata.utils.update_etc_hosts_from_kv,
+                nodemanagers.register_connected_hosts,
+                namenode.register_provided_hosts,
+                jujubigdata.utils.manage_etc_hosts,
                 hdfs.configure_client,
                 yarn.configure_resourcemanager,
                 yarn.configure_jobhistory,
 
=== modified file 'resources.yaml'
--- resources.yaml	2015-06-10 21:51:54 +0000
+++ resources.yaml	2015-06-19 15:38:13 +0000
@@ -8,7 +8,11 @@
   six:
     pypi: six
   jujubigdata:
+<<<<<<< TREE
     pypi: jujubigdata>=1.2.14,<2.0.0
+=======
+    pypi: jujubigdata>=2.0.0,<3.0.0
+>>>>>>> MERGE-SOURCE
   charmhelpers:
     pypi: http://bazaar.launchpad.net/~bigdata-dev/bigdata-data/trunk/download/kevin.monroe%40canonical.com-20150610215108-gq4ud2rriy1sp1h6/charmhelpers0.3.1.ta-20150610215050-vxrqhizdsrqwnmcm-1/charmhelpers-0.3.1.tar.gz
     hash: 061fe7204289b96fab5d3ca02883040ea3026526ebf0ad38e21457527a18d139