Fix problem with test playbook

Author: dietrichliko

LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2019 Institute for High energy Physics, Austrian Academy of Sciences
+Copyright (c) 2019 Institute for High energy Physics
+                  Austrian Academy of Sciences
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 # htcondor_ce [![Build Status](https://travis-ci.com/hephyvienna/ansible-role-htcondor-ce.svg?branch=master)](https://travis-ci.com/hephyvienna/ansible-role-htcondor-ce) [![Ansible Role](https://img.shields.io/ansible/role/41511.svg)](https://galaxy.ansible.com/hephyvienna/htcondor-ce)
 
-A brief description of the role goes here.
+Configuraion of the HTCondor CE for WLCG/EGI site
 
 Inspired by the [Puppet Module](https://github.com/cernops/puppet-htcondor_ce)
 and the [Wiki entry](https://wiki.infn.it/progetti/htcondor-tf/htcondor-ce_setup).
@@ -32,11 +32,11 @@ Did not test this feature.
 
     htcondor_ce_enable_bdii: true
 
-Enable BDDI of service
+Enable BDII publictaion of the service
 
     htcondor_ce_uid_domain: "{{ ansible_domain }}"
 
-Recognise local condor daemons as friendly (not useful for batch systemn deployment)
+Recognise local condor daemons as friendly (not useful for batch system deployment)
 
     htcondor_ce_condor_view_hosts: []
 
@@ -50,17 +50,11 @@ Set appropriate place to route.
 
 
     htcondor_ce_benchmark_result: 10.00-HEP-SPEC06
-
-For BDII publishing
-
     htcondor_ce_execution_env_cores: 16
-
-For BDII publishing
-
     htcondor_ce_election_hosts:
       - "{{ ansible_fqdn }}"
 
-For BDII publishing
+For publication in the BDII
 
     htcondor_ce_argus_server: argus.hephy.oeaw.ac.at
 
@@ -80,9 +74,6 @@ Argus resource id
 
 ## Example Playbook
 
-Including an example of how to use your role (for instance, with variables
-passed in as parameters) is always nice for users too:
-
     - hosts: servers
       vars:
         poolaccounts:
@@ -118,7 +109,6 @@ passed in as parameters) is always nice for users too:
         grid_vos:
           - cms
       roles:
-        - role: geerlingguy.repo-epel
         - role: hephyvienna.poolaccounts
         - role: hephyvienna.grid
         - role: hephyvienna.htcondor-ce

molecule/default/playbook.yml

@@ -32,12 +32,17 @@
         group: cmssgm
         gid: 13000
         groups: cms
-    grid_enable_dummy_ca: true
-    grid_enable_dummy_hostcert: true
+    grid_dummy_host_certificate: true
     grid_vos:
       - cms
+
+  pre_tasks:
+    - name: Enable EPEL
+      package:
+        name: epel-release
+        state: present
+
   roles:
-    - role: geerlingguy.repo-epel
     - role: hephyvienna.poolaccounts
     - role: hephyvienna.grid
     - role: hephyvienna.htcondor-ce

molecule/default/requirements.yml

@@ -1,4 +1,3 @@
 ---
-- src: geerlingguy.repo-epel
 - src: hephyvienna.grid
 - src: hephyvienna.poolaccounts

tasks/htcondor-ce.yml

@@ -9,16 +9,14 @@
 
 - name: Copy certificates
   copy:
-    src: "/etc/grid-security/{{ item.src }}"
-    dest: "/etc/grid-security/{{ item.dest }}"
+    src: "/etc/grid-security/host{{ item }}.pem"
+    dest: "/etc/grid-security/condor{{ item }}.pem"
     remote_src: true
     owner: condor
     group: condor
   loop:
-    - src: hostcert.pem
-      dest: condorcert.pem
-    - src: hostkey.pem
-      dest: condorkey.pem
+    - cert
+    - key
 
 - name: Configure HTCondor CE
   template: