Skip to content

Commit 1186ca5

Browse files
committed
Add path to HDFS packages for scale release lower 5.1.2.0
Remove unused ansible handler from FileAditLogging.
1 parent c5c355b commit 1186ca5

File tree

5 files changed

+21
-8
lines changed

5 files changed

+21
-8
lines changed

roles/callhome/node/tasks/zypper/install.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@
1212

1313
- name: install | Enable repo metadata gpg check
1414
command: "zypper modifyrepo --default-gpgcheck --all"
15+
args:
16+
warn: false
17+

roles/scale_fileauditlogging/node/handlers/main.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

roles/scale_fileauditlogging/node/tasks/install.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@
5151

5252
- include_tasks: install_{{ scale_installmethod }}.yml
5353

54-
- meta: flush_handlers
55-
5654
#
5755
# Install or update RPMs
5856
#

roles/scale_hdfs/node/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ hdfs_rhel_version_path_33: 'hdfs_rpms/rhel/hdfs_3.3.x/'
2323
# Directory to install 3.1.1.x hdfs package
2424
hdfs_sles_version_path: 'hdfs_rpms/rhel/hdfs_3.1.1.x/'
2525

26-
# Directory to install 3.3.x hdfs package
26+
# Directory to install 3.1.1.x hdfs package
2727
hdfs_ubuntu_version_path: 'hdfs_debs/ubuntu/hdfs_3.1.1.x/'

roles/scale_hdfs/node/tasks/install.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,28 @@
9090
- include_tasks: prepare_env.yml
9191

9292
- block:
93-
- name:
93+
- name: install | Fetch hdfs version
9494
set_fact:
95-
hdfs_version_path_selection_rhel: "{{ hdfs_rhel_version_path_33 }}"
95+
hdfs_version_path_selection_rhel: "{{ hdfs_rhel_version_path_33 }}"
9696
when: transparency_33_enabled|bool
9797

9898
- name: install | Fetch hdfs rpm dir path for rhel
9999
set_fact:
100-
hdfs_rpm_path_rhel: "{{ hdfs_version_path_selection_rhel }}"
100+
hdfs_rpm_path_rhel: "{{ hdfs_version_path_selection_rhel }}"
101+
102+
- name: install | Set correct hdfs rpm dir path for scale release lower 5.1.2
103+
set_fact:
104+
hdfs_rpm_path_rhel: "{{ hdfs_rpm_path_rhel | replace('/rhel/','/rhel7/') }}"
105+
when: scale_version is version_compare('5.1.2', '<')
106+
107+
- name: install | Fetch hdfs rpm dir path for sles
108+
set_fact:
109+
hdfs_rpm_path_sles: "{{ hdfs_sles_version_path }}"
110+
111+
- name: install | Fetch hdfs rpm dir path for ubuntu
112+
set_fact:
113+
hdfs_rpm_path_ubuntu: "{{ hdfs_ubuntu_version_path }}"
114+
101115
run_once: true
102116
delegate_to: localhost
103117

0 commit comments

Comments
 (0)