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/27 14:59:15 UTC
[airavata] branch develop updated (c02b3a5674 -> 58835358ce)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
from c02b3a5674 Merge branch 'AIRAVATA-3609-develop-inventory' into develop
new 8ab4ae1b86 Ansible: removing duplicate value
new c0dc2e0734 Ansible: fixing dnf cron setup
new 58835358ce Ansible: fixing python3-mysql install
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../scigap/develop-js2/group_vars/all/vars.yml | 2 -
.../roles/django/tasks/install_deps_Rocky_8.yml | 1 +
.../roles/env_setup/tasks/files/dnf-cron.conf | 2 +-
dev-tools/ansible/roles/env_setup/tasks/main.yml | 56 +++++++++++-----------
4 files changed, 30 insertions(+), 31 deletions(-)
[airavata] 02/03: Ansible: fixing dnf cron setup
Posted by ma...@apache.org.
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
commit c0dc2e073415f5c234f1e81295f7c62325d9d3db
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jul 27 10:58:47 2022 -0400
Ansible: fixing dnf cron setup
---
.../roles/env_setup/tasks/files/dnf-cron.conf | 2 +-
dev-tools/ansible/roles/env_setup/tasks/main.yml | 56 +++++++++++-----------
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/dev-tools/ansible/roles/env_setup/tasks/files/dnf-cron.conf b/dev-tools/ansible/roles/env_setup/tasks/files/dnf-cron.conf
index 7fe6949be0..bd38ef404d 100644
--- a/dev-tools/ansible/roles/env_setup/tasks/files/dnf-cron.conf
+++ b/dev-tools/ansible/roles/env_setup/tasks/files/dnf-cron.conf
@@ -72,7 +72,7 @@ group_package_types = mandatory, default
# -4: critical
# -3: critical+errors
# -2: critical+errors+warnings (default)
-debuglevel = -2
+debuglevel = 2
# skip_broken = True
mdpolicy = group:main
diff --git a/dev-tools/ansible/roles/env_setup/tasks/main.yml b/dev-tools/ansible/roles/env_setup/tasks/main.yml
index 44645cdd46..eac347e29f 100644
--- a/dev-tools/ansible/roles/env_setup/tasks/main.yml
+++ b/dev-tools/ansible/roles/env_setup/tasks/main.yml
@@ -34,11 +34,6 @@
become: yes
when: ansible_os_family == "RedHat"
-- name: Install Firewalld (Rocky)
- dnf: name=firewalld
- become: yes
- when: ansible_os_family == "Rocky"
-
- name: Install Firewalld (Debian)
apt: name=firewalld state=latest update_cache=yes
become: yes
@@ -62,7 +57,7 @@
firewalld: port="22/tcp"
zone=public permanent=true state=enabled immediate=yes
become: yes
- when: ansible_os_family == "RedHat" or ansible_os_family == "Rocky"
+ when: ansible_os_family == "RedHat"
# Issues with firewalld module on Ubuntu https://github.com/ansible/ansible/issues/24855
# So as workaround, just calling firewall-cmd directly for now
@@ -78,33 +73,38 @@
# Automatic security updates installation
-# TODO: switch to dnf-automatic for Rocky Linux
-# - name: Install yum-cron, yum-utils (RedHat)
-# yum: name={{ item }} state=latest update_cache=yes
-# become: yes
-# when: ansible_os_family == "RedHat"
-# with_items:
-# - yum-cron
-# - yum-utils
-
-# - name: Copy yum-cron.conf config file
-# copy:
-# src: yum-cron.conf
-# dest: /etc/yum/yum-cron.conf
-# backup: yes
-# become: yes
-# when: ansible_os_family == "RedHat"
-
-- name: Copy dnf-cron.conf config file (RedHat or Rocky)
+- 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"
+ with_items:
+ - yum-cron
+ - yum-utils
+
+- name: Copy yum-cron.conf config file (CentOS)
copy:
- src: dnf-cron.conf
- dest: /etc/dnf/automatic.conf
+ src: yum-cron.conf
+ dest: /etc/yum/yum-cron.conf
backup: yes
become: yes
- when: ansible_os_family == "Rocky"
+ when: ansible_os_family == "RedHat" and 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"
+ when: ansible_os_family == "RedHat" and ansible_distribution == "CentOS"
+
+- name: Copy dnf-cron.conf config file (Rocky)
+ copy:
+ src: dnf-cron.conf
+ dest: /etc/dnf/automatic.conf
+ backup: yes
+ become: yes
+ when: ansible_os_family == "RedHat" and 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"
+
...
[airavata] 01/03: Ansible: removing duplicate value
Posted by ma...@apache.org.
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
commit 8ab4ae1b8606a0c80beddad10c69168f04221807
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jul 27 10:58:19 2022 -0400
Ansible: removing duplicate value
---
.../ansible/inventories/scigap/develop-js2/group_vars/all/vars.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vars.yml
index 3b28cfcc39..4b3eb03ccc 100644
--- a/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vars.yml
@@ -235,5 +235,3 @@ monitoring_subnets: "{{ iu_subnets }}"
# Zabbix
zabbix_server: "rt-watch.uits.indiana.edu"
-
-letsencrypt_email: "circ-iu-group@iu.edu"
[airavata] 03/03: Ansible: fixing python3-mysql install
Posted by ma...@apache.org.
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
commit 58835358cea76e34c45081ead13160e19ffa9338
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jul 27 10:59:05 2022 -0400
Ansible: fixing python3-mysql install
---
dev-tools/ansible/roles/django/tasks/install_deps_Rocky_8.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-tools/ansible/roles/django/tasks/install_deps_Rocky_8.yml b/dev-tools/ansible/roles/django/tasks/install_deps_Rocky_8.yml
index d81472cad9..007ec1d180 100644
--- a/dev-tools/ansible/roles/django/tasks/install_deps_Rocky_8.yml
+++ b/dev-tools/ansible/roles/django/tasks/install_deps_Rocky_8.yml
@@ -27,5 +27,6 @@
loop_control:
loop_var: package
become: true
+ become_user: root
...