From 17ff86bd5909c76de8ffada59971c00ce3e289b2 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Mon, 7 Oct 2024 22:21:12 -0500
Subject: [PATCH] refactor: Move vars to appropriate group_var files
We parameterized a few tasks in the cheaha.yml and put the vars in
group_vars/all so that the existing knightly builds won't break.
We added values required for the CoD deploy in group_vars/proxy. Now if
we put the proxy nodes in proxy group they will inherit values meant for
CoD deploy which is not desired in production.
We later realized that the appropriate file is group_vars/knightly and
it gives flexibility to put proxy nodes in knightly group to override
the vars meant for CoD in group_vars/all.
---
ansible/group_vars/all | 15 ++++++++++-----
ansible/group_vars/knightly | 9 +++++++++
ansible/group_vars/proxy | 10 ----------
3 files changed, 19 insertions(+), 15 deletions(-)
create mode 100644 ansible/group_vars/knightly
delete mode 100644 ansible/group_vars/proxy
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index 7ab54055..c0b71fcd 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -13,11 +13,16 @@
root_ssh_key: ""
+# cheaha.node related
hostname_lookup_table:
- - "172.20.0.24 cheaha-master02.cm.cluster cheaha-master02"
- - "172.20.0.22 cheaha-master01.cm.cluster cheaha-master01"
- - "172.20.0.25 master.cm.cluster master localmaster.cm.cluster localmaster ldapserver.cm.cluster ldapserver"
+ - "10.141.255.254 master.cm.cluster master localmaster.cm.cluster localmaster ldapserver.cm.cluster ldapserver"
- bright_openldap_path: "/cm/local/apps/openldap"
- ldap_cert_path: "{{bright_openldap_path}}/etc/certs"
+# ldap_config related
+ ldap_cert_path: "/etc/openldap/certs"
+ ldap_uri: "ldap://ldapserver"
+
+# nfs_mounts related
+ mount_points:
+ - /gpfs4
+ - /gpfs5
diff --git a/ansible/group_vars/knightly b/ansible/group_vars/knightly
new file mode 100644
index 00000000..ee662aad
--- /dev/null
+++ b/ansible/group_vars/knightly
@@ -0,0 +1,9 @@
+---
+ hostname_lookup_table:
+ - "172.20.0.24 cheaha-master02.cm.cluster cheaha-master02"
+ - "172.20.0.22 cheaha-master01.cm.cluster cheaha-master01"
+ - "172.20.0.25 master.cm.cluster master localmaster.cm.cluster localmaster ldapserver.cm.cluster ldapserver"
+
+ bright_openldap_path: "/cm/local/apps/openldap"
+ ldap_cert_path: "{{bright_openldap_path}}/etc/certs"
+ ldap_uri: "ldaps://ldapserver"
diff --git a/ansible/group_vars/proxy b/ansible/group_vars/proxy
deleted file mode 100644
index 819e47c9..00000000
--- a/ansible/group_vars/proxy
+++ /dev/null
@@ -1,10 +0,0 @@
----
- hostname_lookup_table:
- - "10.141.255.254 master.cm.cluster master localmaster.cm.cluster localmaster ldapserver.cm.cluster ldapserver"
-
- ldap_cert_path: "/etc/openldap/certs"
-
- mount_points:
- - /gpfs4
- - /gpfs5
-
--
GitLab