Added few more changes from dev to master

Signed-off-by: Dherendra Singh <dhersing@in.ibm.com>

Author: dheren-git

roles/scale_hdfs/cluster/tasks/configure.yml

@@ -96,7 +96,7 @@
 
 - name: check | Check free ces ip
   shell:
-   cmd: "mmces address list -Y|grep -v -e hdfs -e object|awk -F: '{print $7}'|grep -v cesAddress"
+   cmd: "mmces address list -Y|awk -F: '(length($9) == 0){print $7}'"
   register: scale_free_ces
   delegate_to: "{{ scale_server }}"
   run_once: true
@@ -108,6 +108,8 @@
   when:
     - scale_existing_ces_ip.stdout | length == 0
     - scale_free_ces.stdout_lines | length > 0
+  delegate_to: "{{ scale_server }}"
+  run_once: true
 
 - block:
    - name: check | fetch mountpoint
@@ -140,7 +142,7 @@
   delegate_to: "{{ scale_server }}"
 
 - name: configure | Check HDFS ces_group
-  shell: "/usr/lpp/mmfs/bin/mmces address list|grep {{ scale_hdfs_ces_group_name }}"
+  shell: "/usr/lpp/mmfs/bin/mmces address list|grep -w {{ scale_hdfs_ces_group_name }}"
   register: check_hdfs_ces_group
   run_once: true
   delegate_to: "{{ scale_server }}"

roles/scale_hdfs/node/defaults/main.yml

@@ -23,5 +23,5 @@ hdfs_rhel_version_path_33: 'hdfs_rpms/rhel/hdfs_3.3.x/'
 # Directory to install 3.1.1.x hdfs package
 hdfs_sles_version_path: 'hdfs_rpms/rhel/hdfs_3.1.1.x/'
 
-# Directory to install 3.3.x hdfs package
+# Directory to install 3.1.1.x hdfs package
 hdfs_ubuntu_version_path: 'hdfs_debs/ubuntu/hdfs_3.1.1.x/'

roles/scale_hdfs/node/tasks/install.yml

@@ -90,14 +90,28 @@
 - include_tasks: prepare_env.yml
 
 - block:
-  - name:
+  - name: install | Fetch hdfs version 
     set_fact:
-       hdfs_version_path_selection_rhel: "{{ hdfs_rhel_version_path_33 }}"
+      hdfs_version_path_selection_rhel: "{{ hdfs_rhel_version_path_33 }}"
     when: transparency_33_enabled|bool
 
   - name: install | Fetch hdfs rpm dir path for rhel
     set_fact:
-        hdfs_rpm_path_rhel: "{{ hdfs_version_path_selection_rhel }}" 
+      hdfs_rpm_path_rhel: "{{ hdfs_version_path_selection_rhel }}" 
+
+  - name: install | Set correct hdfs rpm dir path for scale release lower 5.1.2
+    set_fact:
+      hdfs_rpm_path_rhel: "{{ hdfs_rpm_path_rhel | replace('/rhel/','/rhel7/') }}" 
+    when: scale_version is version_compare('5.1.2', '<')
+
+  - name: install | Fetch hdfs rpm dir path for sles
+    set_fact:
+      hdfs_rpm_path_sles: "{{ hdfs_sles_version_path }}" 
+  
+  - name: install | Fetch hdfs rpm dir path for ubuntu
+    set_fact:
+      hdfs_rpm_path_ubuntu: "{{ hdfs_ubuntu_version_path }}" 
+
   run_once: true
   delegate_to: localhost