You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2022/07/28 18:51:38 UTC
[airavata] branch develop updated: AIRAVATA-3609 Fix Rocky Linux detection and failure checking
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new a2fc565bc2 AIRAVATA-3609 Fix Rocky Linux detection and failure checking
a2fc565bc2 is described below
commit a2fc565bc2204e8eb8dc169389cd88a3f0cf6d82
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jul 28 14:51:29 2022 -0400
AIRAVATA-3609 Fix Rocky Linux detection and failure checking
---
dev-tools/ansible/roles/api-orch/tasks/main.yml | 6 +++---
dev-tools/ansible/roles/common/tasks/main.yml | 6 +++---
dev-tools/ansible/roles/env_setup/tasks/main.yml | 10 +++++-----
dev-tools/ansible/roles/java/tasks/main.yml | 6 +++---
dev-tools/ansible/roles/keycloak/tasks/main.yml | 6 +++---
dev-tools/ansible/roles/letsencrypt/tasks/main.yml | 15 ++-------------
dev-tools/ansible/roles/rabbitmq/tasks/main.yml | 12 ++++++------
7 files changed, 25 insertions(+), 36 deletions(-)
diff --git a/dev-tools/ansible/roles/api-orch/tasks/main.yml b/dev-tools/ansible/roles/api-orch/tasks/main.yml
index f9794660cc..f121fcb20e 100644
--- a/dev-tools/ansible/roles/api-orch/tasks/main.yml
+++ b/dev-tools/ansible/roles/api-orch/tasks/main.yml
@@ -23,7 +23,7 @@
# api-orch deployment
- name: Create api-orchestrator deployment directory
file: path="{{ api_orch_dir }}" state=directory owner="{{ user }}" group="{{ group }}"
- when: build|success
+ when: build is success
- name: Check previous deployments
stat: path="{{ api_orch_dir }}/{{ airavata_dist }}" get_md5=no get_checksum=no
@@ -158,13 +158,13 @@
state: present
become: yes
become_user: root
- when: ansible_os_family == "Rocky"
+ when: ansible_distribution == "Rocky"
- name: Apply new SELinux file context to filesystem
command: restorecon -v "{{ api_orch_dir }}/{{ airavata_dist }}/bin/airavata-server-start.sh"
become: yes
become_user: root
- when: ansible_os_family == "Rocky"
+ when: ansible_distribution == "Rocky"
- name: start api-orch
service: name=apiorch state=started enabled=yes daemon_reload=yes
diff --git a/dev-tools/ansible/roles/common/tasks/main.yml b/dev-tools/ansible/roles/common/tasks/main.yml
index 41b8844ede..8681c29412 100644
--- a/dev-tools/ansible/roles/common/tasks/main.yml
+++ b/dev-tools/ansible/roles/common/tasks/main.yml
@@ -19,19 +19,19 @@
#
---
-- name: Install Airavata pre-requireties
+- name: Install Airavata pre-requireties (CentOS)
yum: name={{ item }} state=latest update_cache=yes
with_items:
- git
become_user: root
- when: ansible_os_family == "Redhat"
+ when: ansible_distribution == "CentOS"
- name: Install Airavata pre-requireties (Rocky)
dnf: name={{ item }}
with_items:
- git
become_user: root
- when: ansible_os_family == "Rocky"
+ when: ansible_distribution == "Rocky"
- name: download {{ apache_maven_version }}
get_url: url="{{ apache_maven_url }}" dest="/opt/{{ apache_maven_version }}-bin.tar.gz"
diff --git a/dev-tools/ansible/roles/env_setup/tasks/main.yml b/dev-tools/ansible/roles/env_setup/tasks/main.yml
index eac347e29f..b8c8e111f6 100644
--- a/dev-tools/ansible/roles/env_setup/tasks/main.yml
+++ b/dev-tools/ansible/roles/env_setup/tasks/main.yml
@@ -76,7 +76,7 @@
- name: Install yum-cron, yum-utils (CentOS)
yum: name={{ item }} state=latest update_cache=yes
become: yes
- when: ansible_os_family == "RedHat" and ansible_distribution == "CentOS"
+ when: ansible_distribution == "CentOS"
with_items:
- yum-cron
- yum-utils
@@ -87,12 +87,12 @@
dest: /etc/yum/yum-cron.conf
backup: yes
become: yes
- when: ansible_os_family == "RedHat" and ansible_distribution == "CentOS"
+ when: ansible_distribution == "CentOS"
- name: Enable and start yum-cron
service: name=yum-cron state=started enabled=yes daemon_reload=yes
become: yes
- when: ansible_os_family == "RedHat" and ansible_distribution == "CentOS"
+ when: ansible_distribution == "CentOS"
- name: Copy dnf-cron.conf config file (Rocky)
copy:
@@ -100,11 +100,11 @@
dest: /etc/dnf/automatic.conf
backup: yes
become: yes
- when: ansible_os_family == "RedHat" and ansible_distribution == "Rocky"
+ when: ansible_distribution == "Rocky"
- name: Enable and start dnf-cron (Rocky)
service: name=dnf-automatic.timer enabled=yes daemon_reload=yes
become: yes
- when: ansible_os_family == "RedHat" and ansible_distribution == "Rocky"
+ when: ansible_distribution == "Rocky"
...
diff --git a/dev-tools/ansible/roles/java/tasks/main.yml b/dev-tools/ansible/roles/java/tasks/main.yml
index 2088c123fa..049c1612f9 100644
--- a/dev-tools/ansible/roles/java/tasks/main.yml
+++ b/dev-tools/ansible/roles/java/tasks/main.yml
@@ -19,19 +19,19 @@
#
---
-- name: Install OpenJDK 11
+- name: Install OpenJDK 11 (CentOS)
yum: name="{{ openjdk_version }}" state=present update_cache=yes
become: yes
tags:
- always
- when: ansible_os_family == "Redhat"
+ when: ansible_distribution == "CentOS"
- name: Install OpenJDK 11 (Rocky)
dnf: name="{{ openjdk_version_rocky }}"
become: yes
tags:
- always
- when: ansible_os_family == "Rocky"
+ when: ansible_distribution == "Rocky"
# NOTE: If you see a file not found error, try running rm /var/lib/alternatives/{{ item.exe }} in the target machine
diff --git a/dev-tools/ansible/roles/keycloak/tasks/main.yml b/dev-tools/ansible/roles/keycloak/tasks/main.yml
index e8e7a615d9..680123ff77 100644
--- a/dev-tools/ansible/roles/keycloak/tasks/main.yml
+++ b/dev-tools/ansible/roles/keycloak/tasks/main.yml
@@ -19,15 +19,15 @@
#
---
-- name: Install httpd
+- name: Install httpd (CentOS)
yum: name="httpd" state=latest update_cache=yes
become: yes
- when: ansible_os_family == "RedHat"
+ when: ansible_distribution == "CentOS"
- name: Install httpd (Rocky)
dnf: name="httpd"
become: yes
- when: ansible_os_family == "Rocky"
+ when: ansible_distribution == "Rocky"
- name: Install java
yum: name="java-1.8.0-openjdk-devel" state=present update_cache=yes
diff --git a/dev-tools/ansible/roles/letsencrypt/tasks/main.yml b/dev-tools/ansible/roles/letsencrypt/tasks/main.yml
index 413f792673..6fee7fb88d 100644
--- a/dev-tools/ansible/roles/letsencrypt/tasks/main.yml
+++ b/dev-tools/ansible/roles/letsencrypt/tasks/main.yml
@@ -23,17 +23,6 @@
- include_tasks: install_deps_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml
when: ansible_os_family == "RedHat"
-- name: install certbot and dependencies (Rocky)
- dnf: name={{ item }}
- with_items:
- - epel-release
- - mod_ssl
- - certbot
- - python3-certbot-apache
- become: true
- become_user: root
- when: ansible_os_family == "Rocky"
-
- name: add Certbot PPA repository
apt_repository:
repo: "ppa:certbot/certbot"
@@ -61,7 +50,7 @@
daemon_reload: true
become: true
become_user: root
- when: ansible_os_family == "RedHat" or ansible_os_family == "Rocky"
+ when: ansible_os_family == "RedHat"
- name: enable certbot (letsencrypt) renewal timer
@@ -72,5 +61,5 @@
daemon_reload: true
become: true
become_user: root
- when: ansible_os_family == "RedHat" or ansible_os_family == "Rocky"
+ when: ansible_os_family == "RedHat"
diff --git a/dev-tools/ansible/roles/rabbitmq/tasks/main.yml b/dev-tools/ansible/roles/rabbitmq/tasks/main.yml
index 2ee69ba9c2..b9a3ed43c5 100644
--- a/dev-tools/ansible/roles/rabbitmq/tasks/main.yml
+++ b/dev-tools/ansible/roles/rabbitmq/tasks/main.yml
@@ -21,25 +21,25 @@
---
################################################################################
# Setup and run rabbitmq
-- name: Install erlang latest version
+- name: Install erlang latest version (CentOS)
yum: name=https://www.rabbitmq.com/releases/erlang/erlang-18.3-1.el7.centos.x86_64.rpm state=present
become: yes
- when: ansible_os_family == "Redhat"
+ when: ansible_distribution == "CentOS"
- name: Install erlang latest version (Rocky)
dnf: name=https://github.com/rabbitmq/erlang-rpm/releases/download/v24.1.4/erlang-24.1.4-1.el8.x86_64.rpm
become: yes
- when: ansible_os_family == "Rocky"
+ when: ansible_distribution == "Rocky"
-- name: Install Rabbitmq rpm
+- name: Install Rabbitmq rpm (CentOS)
yum: name=https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.3/rabbitmq-server-3.6.3-1.noarch.rpm state=present
become: yes
- when: ansible_os_family == "Redhat"
+ when: ansible_distribution == "CentOS"
- name: Install Rabbitmq rpm (Rocky)
dnf: name=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.10.6/rabbitmq-server-3.10.6-1.el8.noarch.rpm
become: yes
- when: ansible_os_family == "Rocky"
+ when: ansible_distribution == "Rocky"
- name: allow only selected networks to access Airavata RabbitMQ
firewalld: