Minor refactoring on ZK and hadoop-mesos

theclaymethod · Nov 26, 2014 · b3cfb33 · b3cfb33
1 parent face110
commit b3cfb33
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,7 @@
 spark-1.1.0-bin-cdh4.tgz
 
 nonHA/spark-job-server.jar
+
+nonHA/hadoop-mesos-0.0.8.jar
+
+nonHA/hadoop-2.5.0-cdh5.2.0-i.tar.gz
diff --git a/roles/cdh5-base/templates/hadoop/core-site.xml.j2 b/roles/cdh5-base/templates/hadoop/core-site.xml.j2
@@ -35,11 +35,6 @@
     <value>{{ fs_trash_interval }}</value>
   </property>
 
-  <!-- <property>
-    <name>ha.zookeeper.quorum</name>
-    <value>{{ groups['mesos-masters'] | join(':2181,') }}:2181</value>
-  </property>
- -->
  <property>
     <name>ha.zookeeper.quorum</name>
     <value>{{ groups['mesos-masters'] | join('.' ~ tl_domain + ':2181' + ',') }}.{{ tl_domain }}:2181</value>

diff --git a/roles/hadoop/tasks/main.yml b/roles/hadoop/tasks/main.yml
@@ -50,14 +50,8 @@
   - { cmd: "mv /opt/src/{{ CDH5_HADOOP_DISTRO }}/etc/hadoop-mapreduce1", dest: "/opt/src/{{ CDH5_HADOOP_DISTRO }}/etc/hadoop" }
   - { cmd: "rm /opt/src/{{ CDH5_HADOOP_DISTRO }}/share/hadoop/mapreduce && ln -s /opt/src/{{ CDH5_HADOOP_DISTRO }}/share/hadoop/mapreduce1", dest: "/opt/src/{{ CDH5_HADOOP_DISTRO }}/share/hadoop/mapreduce" }
   args:
-    #creates: "{{item.dest}}"
     chdir: /opt/src/
 
-
-
-# - name: set up repo
-#   shell: provision-cdh5.sh chdir=/opt/src/{{ CDH5_HADOOP_DISTRO }}
-
 - name: compress cdh5 archive
   command: tar czf {{ CDH5_HADOOP_DISTRO }}-i.tar.gz {{ CDH5_HADOOP_DISTRO }}
   args: