Scientific Linux compatibility, not needing to use a proxy and the epel url is broken

[smcgrat]

Hi guys,

Firstly, this looks like a really useful tool. Good job and many thanks.

1. We use Scientific Linux in my environment instead of CentOS so I modified your playbooks to add that as an option. There's probably a better way to do it.
2. I also used a hack to avoid using a proxy, it was giving me issues getting working and I didn't need one anyway so I just commented it out in places. There's a much better way to do that I'm sure. Sorry if I missed something obvious for a better way to do so.
3. Finally, your epel link in the config.yml is brokend.

Here's my patch from 1 & 2.

diff --git a/playbook/install_master.yml b/playbook/install_master.yml
index 4aeab2e..46e6e64 100644
--- a/playbook/install_master.yml
+++ b/playbook/install_master.yml
@@ -8,10 +8,10 @@
     - validation/selinux
     - validation/ssh
     - validation/network
-    - common/proxy
+#    - common/proxy
     - common/firewall
     - common/ntp
-    - master/squid
+#    - master/squid
     - repos
     - master/local_repo
     - master/ohpc_base
diff --git a/playbook/roles/common/proxy/tasks/centos.yml b/playbook/roles/common/proxy/tasks/centos.yml
index 76cc213..a2327f2 100644
--- a/playbook/roles/common/proxy/tasks/centos.yml
+++ b/playbook/roles/common/proxy/tasks/centos.yml
@@ -6,6 +6,6 @@
     state: present
     regexp: "proxy=.*"
     insertafter: EOF
-    line: "proxy=http://{{ proxy_host }}:{{ proxy_port }}/"
+    line: "#\#\#proxy=http://{{ proxy_host }}:{{ proxy_port }}/"
   when: proxy_host != ''
 
diff --git a/playbook/roles/dev_tools/tasks/main.yml b/playbook/roles/dev_tools/tasks/main.yml
index dc7b0c6..8c99275 100644
--- a/playbook/roles/dev_tools/tasks/main.yml
+++ b/playbook/roles/dev_tools/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 
 - import_tasks: centos.yml
-  when: (ansible_distribution == 'CentOS')
+  when: (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
diff --git a/playbook/roles/master/local_repo/tasks/main.yml b/playbook/roles/master/local_repo/tasks/main.yml
index 55fa922..8c99275 100644
--- a/playbook/roles/master/local_repo/tasks/main.yml
+++ b/playbook/roles/master/local_repo/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 
 - import_tasks: centos.yml
-  when: (ansible_distribution == 'CentOS')
\ No newline at end of file
+  when: (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
diff --git a/playbook/roles/master/nfs/tasks/main.yml b/playbook/roles/master/nfs/tasks/main.yml
index 2470183..4341fa1 100644
--- a/playbook/roles/master/nfs/tasks/main.yml
+++ b/playbook/roles/master/nfs/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
 - import_tasks: centos.yml
-  when: (ansible_distribution == 'CentOS')
+  when: (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
 
 - import_tasks: common.yml
diff --git a/playbook/roles/master/ohpc_base/tasks/main.yml b/playbook/roles/master/ohpc_base/tasks/main.yml
index 55fa922..8c99275 100644
--- a/playbook/roles/master/ohpc_base/tasks/main.yml
+++ b/playbook/roles/master/ohpc_base/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 
 - import_tasks: centos.yml
-  when: (ansible_distribution == 'CentOS')
\ No newline at end of file
+  when: (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
diff --git a/playbook/roles/master/pbs/tasks/main.yml b/playbook/roles/master/pbs/tasks/main.yml
index afd7f89..060ec1e 100644
--- a/playbook/roles/master/pbs/tasks/main.yml
+++ b/playbook/roles/master/pbs/tasks/main.yml
@@ -2,7 +2,7 @@
 
 - import_tasks: centos.yml
   when:
-    - (ansible_distribution == 'CentOS')
+    - (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
     - resource_manager == 'pbs'
 
 - import_tasks: common.yml
diff --git a/playbook/roles/master/squid/tasks/main.yml b/playbook/roles/master/squid/tasks/main.yml
index d4c4e6a..018788a 100644
--- a/playbook/roles/master/squid/tasks/main.yml
+++ b/playbook/roles/master/squid/tasks/main.yml
@@ -2,5 +2,6 @@
 
 - import_tasks: centos.yml
   when:
-    - ansible_distribution == 'CentOS'
-    - repository_type == 'cache'
\ No newline at end of file
+    - (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
+    - (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
+    - repository_type == 'cache'
diff --git a/playbook/roles/master/xcat_base/tasks/main.yml b/playbook/roles/master/xcat_base/tasks/main.yml
index 87bd1e6..385460a 100644
--- a/playbook/roles/master/xcat_base/tasks/main.yml
+++ b/playbook/roles/master/xcat_base/tasks/main.yml
@@ -2,7 +2,7 @@
 
 - import_tasks: centos.yml
   when:
-    - ansible_distribution == 'CentOS'
+    - (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
     - deploy == 'xCAT'
 
 - import_tasks: common.yml
diff --git a/playbook/roles/node/nfs/tasks/main.yml b/playbook/roles/node/nfs/tasks/main.yml
index 55fa922..8c99275 100644
--- a/playbook/roles/node/nfs/tasks/main.yml
+++ b/playbook/roles/node/nfs/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 
 - import_tasks: centos.yml
-  when: (ansible_distribution == 'CentOS')
\ No newline at end of file
+  when: (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
diff --git a/playbook/roles/node/ohpc_base_compute/tasks/main.yml b/playbook/roles/node/ohpc_base_compute/tasks/main.yml
index 2b62e85..8c99275 100644
--- a/playbook/roles/node/ohpc_base_compute/tasks/main.yml
+++ b/playbook/roles/node/ohpc_base_compute/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 
 - import_tasks: centos.yml
-  when: ansible_distribution == 'CentOS'
\ No newline at end of file
+  when: (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
diff --git a/playbook/roles/node/pbs/tasks/main.yml b/playbook/roles/node/pbs/tasks/main.yml
index afd7f89..060ec1e 100644
--- a/playbook/roles/node/pbs/tasks/main.yml
+++ b/playbook/roles/node/pbs/tasks/main.yml
@@ -2,7 +2,7 @@
 
 - import_tasks: centos.yml
   when:
-    - (ansible_distribution == 'CentOS')
+    - (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
     - resource_manager == 'pbs'
 
 - import_tasks: common.yml
diff --git a/playbook/roles/repos/tasks/centos.yml b/playbook/roles/repos/tasks/centos.yml
index c13cec8..c8247a3 100644
--- a/playbook/roles/repos/tasks/centos.yml
+++ b/playbook/roles/repos/tasks/centos.yml
@@ -17,7 +17,7 @@
     state: present
     regexp: "proxy=.*"
     insertafter: EOF
-    line: "proxy=http://{{ sms_name }}.{{ domain_name}}:{{ cache_port }}/"
+    line: "###proxy=http://{{ sms_name }}.{{ domain_name}}:{{ cache_port }}/"
   when: repository_type == 'cache'
 
 - name: "Repositories - add the SMS local repository to /etc/yum.repos.d"
diff --git a/playbook/roles/repos/tasks/main.yml b/playbook/roles/repos/tasks/main.yml
index 55fa922..8c99275 100644
--- a/playbook/roles/repos/tasks/main.yml
+++ b/playbook/roles/repos/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 
 - import_tasks: centos.yml
-  when: (ansible_distribution == 'CentOS')
\ No newline at end of file
+  when: (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
diff --git a/playbook/roles/validation/config/tasks/main.yml b/playbook/roles/validation/config/tasks/main.yml
index aff5e81..980d967 100644
--- a/playbook/roles/validation/config/tasks/main.yml
+++ b/playbook/roles/validation/config/tasks/main.yml
@@ -103,7 +103,7 @@
       - (epel_repo_dir | trim != '')
   when:
     - repository_type == 'local' or repository_type == 'mirror'
-    - ansible_distribution == 'CentOS'
+    - ansible_distribution == (ansible_distribution == 'CentOS' or ansible_distribution == 'Scientific')
 
 - name: Validate config - check at least 1 compiler has been defined
   assert:

Many thanks.

Sean

[joshiggins]

Cheers, the scientific stuff looks good, thanks for submitting patches as well 😎

I expect RHEL will work almost the same just need to find some time to test it.

Yeah, we are using squid as a generic way to cache packages which differs a little bit from the recipes. But repository_type: online should bypass this... I'll check it out. This will be the kind of thing that CI test should hopefully pick up when we have that going, which will be cool.

Thanks for taking the time to put this together.