Juju Charms Collection
apache-hadoop-yarn-master package

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

  1. Trusty Tahr (14.04)
  2. etc-hosts-refactor
  3. Merge into trunk
Proposed by Cory Johns
Status: Merged
Merged at revision: 86
Proposed branch: lp:~johnsca/charms/trusty/apache-hadoop-yarn-master/etc-hosts-refactor
Merge into: lp:~bigdata-dev/charms/trusty/apache-hadoop-yarn-master/trunk
Diff against target: 44 lines (+9/-3) (has conflicts)
2 files modified
hooks/common.py (+5/-3)
resources.yaml (+4/-0)
Text conflict in resources.yaml
To merge this branch: bzr merge lp:~johnsca/charms/trusty/apache-hadoop-yarn-master/etc-hosts-refactor
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Review via email: mp+262463@code.launchpad.net

Description of the change

Use refactored /etc/hosts handling

To post a comment you must log in.
Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

lgtm, especially the bzr artifacts. merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/common.py'
2--- hooks/common.py 2015-05-13 16:48:39 +0000
3+++ hooks/common.py 2015-06-19 15:38:13 +0000
4@@ -51,6 +51,7 @@
5 hs_port = dist_config.port('jh_webapp_http')
6 nodemanagers = jujubigdata.relations.ResourceManagerMaster(spec=hadoop.spec, port=port, historyserver_port=hs_port)
7 clients = jujubigdata.relations.ResourceManager(spec=hadoop.spec, port=port, historyserver_port=hs_port)
8+ namenode = jujubigdata.relations.NameNode(spec=hadoop.client_spec)
9 manager = charmframework.Manager([
10 {
11 'name': 'hadoop-base',
12@@ -69,12 +70,13 @@
13 ],
14 'requires': [
15 hadoop.is_installed,
16- jujubigdata.relations.NameNode(spec=hadoop.client_spec),
17+ namenode,
18 jujubigdata.relations.NodeManager(optional=True),
19 ],
20 'callbacks': [
21- nodemanagers.register_host_ips,
22- jujubigdata.utils.update_etc_hosts_from_kv,
23+ nodemanagers.register_connected_hosts,
24+ namenode.register_provided_hosts,
25+ jujubigdata.utils.manage_etc_hosts,
26 hdfs.configure_client,
27 yarn.configure_resourcemanager,
28 yarn.configure_jobhistory,
29
30=== modified file 'resources.yaml'
31--- resources.yaml 2015-06-10 21:51:54 +0000
32+++ resources.yaml 2015-06-19 15:38:13 +0000
33@@ -8,7 +8,11 @@
34 six:
35 pypi: six
36 jujubigdata:
37+<<<<<<< TREE
38 pypi: jujubigdata>=1.2.14,<2.0.0
39+=======
40+ pypi: jujubigdata>=2.0.0,<3.0.0
41+>>>>>>> MERGE-SOURCE
42 charmhelpers:
43 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
44 hash: 061fe7204289b96fab5d3ca02883040ea3026526ebf0ad38e21457527a18d139

Subscribers

People subscribed via source and target branches