bigdata-dev team mailing list archive

[Cory Johns <cory.johns@xxxxxxxxxxxxx>]

Cory Johns has proposed merging lp:~bigdata-dev/charm-helpers/oozie into lp:~bigdata-dev/charm-helpers/framework.

Requested reviews:
  Juju Big Data Development (bigdata-dev)

For more details, see:
https://code.launchpad.net/~bigdata-dev/charm-helpers/oozie/+merge/253834
-- 
Your team Juju Big Data Development is requested to review the proposed merge of lp:~bigdata-dev/charm-helpers/oozie into lp:~bigdata-dev/charm-helpers/framework.

=== modified file 'charmhelpers/contrib/bigdata/handlers/apache.py'
--- charmhelpers/contrib/bigdata/handlers/apache.py	2015-03-17 23:30:17 +0000
+++ charmhelpers/contrib/bigdata/handlers/apache.py	2015-03-23 14:48:02 +0000
@@ -296,9 +296,17 @@
             props['dfs.datanode.max.transfer.threads'] = self.hadoop_base.charm_config['dfs_datanode_max_xcievers']
             props['dfs.datanode.data.dir'] = Path(self.hadoop_base.charm_config['hadoop_dir_base']) / 'cache/hadoop/dfs/name'
             props['dfs.permissions'] = 'false'  # TODO - secure this hadoop installation!
+<<<<<<< TREE
             props['dfs.replication'] = self.hadoop_base.charm_config['dfs_replication']
             props['dfs.heartbeat.interval'] = self.hadoop_base.charm_config['dfs_heartbeat_interval']
             props['dfs.namenode.heartbeat.recheck-interval'] = self.hadoop_base.charm_config['dfs_namenode_heartbeat_recheck_interval']
+=======
+            props['dfs.replication'] = config['dfs_replication']
+            props['dfs.heartbeat.interval'] = config['dfs_heartbeat_interval']
+            props['dfs.namenode.heartbeat.recheck-interval'] = config['dfs_namenode_heartbeat_recheck_interval']
+            props['hadoop.proxyuser.oozie.groups'] = '*'
+            props['hadoop.proxyuser.oozie.hosts'] = '*'
+>>>>>>> MERGE-SOURCE
 
     def format_namenode(self):
         self.stop_namenode()