README, minor structure improvements

play.yml

@@ -1,43 +1,54 @@
 ---
-- hosts: ed-c7-1
+- hosts: all
   tasks:
   - name: "install tools"
     yum:
       name: [ vim-enhanced, htop, screen, bind-utils, nmap-ncat, net-tools ]
       state: present
 
+- hosts: htcondor
+  pre_tasks:
   - name: "install htcondor repo"
     yum:
       name: https://research.cs.wisc.edu/htcondor/repo/8.9/htcondor-release-current.el7.noarch.rpm
       state: present
+    tags: htcondor
 
   - name: "install htcondor software "
     yum:
       name: htcondor-ce
       state: present
+    tags: htcondor
 
   - name: "remove minicondor configuration"
     yum:
       name: minicondor
       state: absent
+    tags: htcondor
 
   - name: "setup singularity"
     import_tasks: "singularity.yml"
     tags: singularity
 
+  roles:
   - name: "setup docker"
-    import_tasks: "docker_setup.yml"
+    role: docker
     tags: docker
 
   - name: "setup htcondor test environment in docker containers"
-    import_role:
-      name: docker-htcondor
-    tags: htcondor-containered
+    role: docker-htcondor
+    tags:
+      - htcondor-containered
+      - htcondor
 
+- hosts: slurm
+  vars:
+    container_privileged: True
+    num_nodes: 3
+  roles:
+  - name: "setup docker"
+    role: docker
+    tags: docker
   - name: "setup slurm test environment in docker containers"
-    import_role:
-      name: slurm
-    vars:
-      container_privileged: True
-      num_nodes: 3
+    role: slurm
     tags: slurm