From e30dc0f91138b9419ab071ec18c784816b2c6e01 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Mon, 10 Oct 2022 17:26:49 -0500
Subject: [PATCH] Move repo file installs into the cheaha.packages role.
---
ansible/roles/cheaha.node/tasks/main.yml | 12 ++----------
ansible/roles/cheaha.packages/tasks/main.yml | 19 +++++++++++++++++++
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/ansible/roles/cheaha.node/tasks/main.yml b/ansible/roles/cheaha.node/tasks/main.yml
index 28f6a9f..1724f3c 100644
--- a/ansible/roles/cheaha.node/tasks/main.yml
+++ b/ansible/roles/cheaha.node/tasks/main.yml
@@ -22,18 +22,11 @@
state: disabled
- name: Copy cm.repo into place (consider making this a template)
ansible.builtin.copy:
- src: "{{ item }}"
- dest: "/etc/yum.repos.d/{{ item }}"
+ src: cm.repo
+ dest: /etc/yum.repos.d/cm.repo
owner: root
group: root
mode: 0644
- loop:
- - cm.repo
- - ceph.repo
- - dell-system-update.repo
- - elastic.repo
- - nux-dextop.repo
- - TurboVNC.repo
- name: Copy CM repo GPG key
ansible.builtin.copy:
src: RPM-GPG-KEY-cm
@@ -64,7 +57,6 @@
- nss-pam-ldapd
- ruby
- python3
- - centos-release-openstack-rocky
state: present
- name: Update nsswitch.conf to look for ldap
ansible.builtin.replace:
diff --git a/ansible/roles/cheaha.packages/tasks/main.yml b/ansible/roles/cheaha.packages/tasks/main.yml
index 282bf41..a12b6e3 100644
--- a/ansible/roles/cheaha.packages/tasks/main.yml
+++ b/ansible/roles/cheaha.packages/tasks/main.yml
@@ -1,6 +1,25 @@
---
# tasks file for cheaha.packages
+- name: Copy yum repo files into place
+ ansible.builtin.copy:
+ src: "{{ item }}"
+ dest: "/etc/yum.repos.d/{{ item }}"
+ owner: root
+ group: root
+ mode: 0644
+ loop:
+ - ceph.repo
+ - dell-system-update.repo
+ - elastic.repo
+ - nux-dextop.repo
+ - TurboVNC.repo
+
+- name: Install openstack-rocky repo
+ yum:
+ name: centos-release-openstack-rocky
+ state: present
+
- name: Install system packages
ansible.builtin.yum:
name: "{{ lookup('file', '{{ pkg_list_file }}').splitlines() }}"
--
GitLab