Prepare for v0.0.1

Final code cleanup for v0.0.1. The role is passing on the top-bdii in the AAROC inventory (CentOS), but failing for Debian. Closed #6
AAROC · Jul 11, 2017 · f3591fc · f3591fc
1 parent 4bfa0c0
commit f3591fc
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,6 @@ This Ansible role configures the host for the installation of [EGI Software prod
 
 The role configures the correct repositories and installs signing keys, as well as the middleware role you wish to add to the host.
 
-
 Requirements
 ------------
 
@@ -31,10 +30,12 @@ No explicit dependencies.
 Example Playbook
 ----------------
 
+An example playbook can be seen in the [AAROC DevOps repo](https://github.com/AAROC/DevOps/blob/master/Ansible/top-bdiis.yml)
 
-    - hosts: servers
+    - hosts: <umd_service>-servers
       roles:
-         - { role: AAROC.umd, umd_service: top-bdii }
+         - { role: UMD-role, become: true, tags: "umd", umd_service: "emi-bdii-top", enable_umd: true, enable_preview: false, umd_version: 4 }
+
 
 License
 -------
@@ -46,3 +47,5 @@ Author Information
 
 Bruce Becker [email protected]
 <a href="https://orcid.org/0000-0002-6607-7145" target="_blank" rel="noopener noreferrer" style="vertical-align:top;"><img src="https://orcid.org/sites/default/files/images/orcid_16x16.png" style="width:1em;margin-right:.5em;" alt="ORCID iD icon">orcid.org/0000-0002-6607-7145</a>
+
+# Citing
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -17,51 +17,65 @@ umd_repos:
       key: http://repository.egi.eu/sw/production/umd/UMD-DEB-PGP-KEY
       squeeze:
         - name: squeeze
+          description: squeeze
           url: "http://repository.egi.eu/sw/production/umd/3/debian/"
         - name: squeeze-updates
+          description: squeeze-updates
           url: http://repository.egi.eu/sw/production/umd/3/debian/
     RedHat:
       key: http://repository.egi.eu/sw/production/umd/UMD-RPM-PGP-KEY
       "6":
         - name: "UMD-3-base"
-        - baseurl: "http://repository.egi.eu/sw/production/umd/3/sl6/{{ ansible_architecture }}/base"
+          description: "UMD-3-base"
+          baseurl: "http://repository.egi.eu/sw/production/umd/3/sl6/{{ ansible_architecture }}/base"
     CentOS:
       key: http://repository.egi.eu/sw/production/umd/UMD-RPM-PGP-KEY
       "6":
-        - name: "UMD-3-base"
-        - baseurl: "http://repository.egi.eu/sw/production/umd/3/sl6/{{ ansible_architecture }}/base"
+        - name: "UMD-3-bae"
+          description: "UMD-3-base"
+          baseurl: "http://repository.egi.eu/sw/production/umd/3/sl6/{{ ansible_architecture }}/base"
 # there is no RedHat 7 repo for UMD3
   4:
     Ubuntu:
       key: http://repository.egi.eu/sw/production/umd/UMD-DEB-PGP-KEY
       "trusty":
         - name: trusty
+          description: trusty
           url: "http://repository.egi.eu/sw/production/umd/4/ubuntu-trusty/"
         - name: trusty-updates
+          description: trusty-updates
           url: http://repository.egi.eu/sw/production/umd/4/trusty-updates
     RedHat:
       key: "http://emisoft.web.cern.ch/emisoft/dist/EMI/3/RPM-GPG-KEY-emi http://repo-rpm.ige-project.eu/RPM-GPG-KEY-IGE http://repository.egi.eu/sw/production/umd/UMD-RPM-PGP-KEY http://www.qoscosgrid.org/qcg-packages/sl5/RPM-GPG-KEY-QCG http://download.nordugrid.org/RPM-GPG-KEY-nordugrid http://fedoraproject.org/static/0608B895.txt"
-      6:
+      "6":
         - name: "UMD-4-base"
+          description: "UMD-4-base"
           baseurl: "http://repository.egi.eu/sw/production/umd/4/sl6/{{ ansible_architecture }}/base"
-        - name: "UMD 4 updates (SL6)"
+        - name: "UMD-4-updates-sl6"
+          description: "UMD-4-updates (SL6)"
           baseurl: "http://repository.egi.eu/sw/production/umd/4/sl6/{{ ansible_architecture }}/updates"
       7:
-        - name: "UMD 4 base (CentOS7)"
+        - name: "UMD-4-base-RH7"
+          description: "UMD 4 base (CentOS7)"
           baseurl: "http://repository.egi.eu/sw/production/umd/4/centos7/{{ ansible_architecture }}/base"
-        - name: "UMD 4 updates (CentOS7)"
+        - name: "UMD-4-updates-RH7"
+          description: "UMD 4 updates (CentOS7)"
           baseurl: "http://repository.egi.eu/sw/production/umd/4/centos7/{{ ansible_architecture }}/updates"
     CentOS:
       key: "http://emisoft.web.cern.ch/emisoft/dist/EMI/3/RPM-GPG-KEY-emi http://repo-rpm.ige-project.eu/RPM-GPG-KEY-IGE http://repository.egi.eu/sw/production/umd/UMD-RPM-PGP-KEY http://www.qoscosgrid.org/qcg-packages/sl5/RPM-GPG-KEY-QCG http://download.nordugrid.org/RPM-GPG-KEY-nordugrid http://fedoraproject.org/static/0608B895.txt"
       "6":
         - name: "UMD-4-base"
+          description: "UMD-4-base"
           baseurl: "http://repository.egi.eu/sw/production/umd/4/sl6/{{ ansible_architecture }}/base"
-        - name: "UMD 4 updates (SL6)"
+        - name: "UMD-4-updates-centos6"
+          description: "UMD 4 updates (SL6)"
           baseurl: "http://repository.egi.eu/sw/production/umd/4/sl6/{{ ansible_architecture }}/updates"
       "7":
-        - name: "UMD 4 base (CentOS7)"
+        - name: "UMD-4-base-centos7"
+          description: "UMD 4 base (CentOS7)"
           baseurl: "http://repository.egi.eu/sw/production/umd/4/centos7/{{ ansible_architecture }}/base"
-        - name: "UMD 4 updates (CentOS7)"
+        - name: "UMD-4-updates-centos7"
+          description: "UMD 4 updates (CentOS7)"
           baseurl: "http://repository.egi.eu/sw/production/umd/4/centos7/{{ ansible_architecture }}/updates"
 
 # CMD = Cloud Middleware Distribution.
@@ -82,13 +96,13 @@ preview_repos:
   Debian:
     key: http://repository.egi.eu/community/keys/APPDBCOMM-DEB-PGP-KEY.asc
     squeeze:
-      - name: squeeze
+      - description: squeeze
         url: http://repository.egi.eu/community/software/preview.repository/1.0/releases/debian
   RedHat:
     6:
-      - name: "Repository for preview.repository (o/s: sl6 arch: x86_64)"
+      - description: "Repository for preview.repository (o/s: sl6 arch: x86_64)"
         baseurl: "http://repository.egi.eu/community/software/preview.repository/1.0/releases/sl/6/{{ ansible_architecture }}/RPMS/"
         key:
     7:
-      - name: "Repository for preview.repository (o/s: centos7 arch: x86_64)"
+      - description: "Repository for preview.repository (o/s: centos7 arch: x86_64)"
         baseurl: "http://repository.egi.eu/community/software/preview.repository/2.0/releases/centos/7/{{ ansible_architecture }}/RPMS/"
diff --git a/tasks/repos-RedHat.yml b/tasks/repos-RedHat.yml
@@ -16,35 +16,7 @@
     gpgcheck: yes
   with_items: "{{ umd_repos[umd_version][ansible_distribution][ansible_distribution_major_version] }}"
 
-
-
 - name: Ensure prorities plugin is configured
   copy:
     src: etc/yum/pluginconf.d/priorities.conf
     dest: /etc/yum/pluginconf.d/prorities.conf
-
-- name: Ensure UMD repos are enabled
-  lineinfile:
-    dest: "/etc/yum.repos.d/{{ item }}"
-    regexp: ^enabled=
-    line: enabled=1
-  with_items:
-    - UMD-3-base.repo
-    - UMD-3-updates.repo
-  tags:
-    - UMD
-
-
-- name: Set priorities of UMD repos
-  lineinfile:
-    dest: /etc/yum.repos.d/{{ item }}
-    regexp: '^priority='
-    line: 'priority=1'
-    insertafter: 'enabled=1'
-  with_items:
-    - UMD-3-base.repo
-    - UMD-3-updates.repo
-  tags:
-    - UMD_priority
-    - UMD
-  # when umd3...