Combine install_xnat & install_container_service playbooks (#89)

Fixes #72 #73. And hopefully SRR.
UCL-MIRSG · Mar 27, 2024 · 85a0c99 · 85a0c99
1 parent 69aeeaf
commit 85a0c99
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 29 deletions.
diff --git a/.github/workflows/molecule-install-xnat.yml b/.github/workflows/molecule-install-xnat.yml
@@ -9,7 +9,6 @@ on:
       - "roles/xnat/**"
       - "roles/xnat_container_service/**"
       - "playbooks/install_xnat.yml"
-      - "playbooks/install_container_service.yml"
       - "playbooks/molecule/**/xnat/**"
       - ".github/workflows/molecule-install-xnat.yml"
   release:

diff --git a/README.md b/README.md
@@ -7,12 +7,11 @@ collection can be used to configure infrastructure for deploying XNAT and OMERO.
 
 ### Playbooks
 
-| Name                                                                               | Description                                                                   |
-| ---------------------------------------------------------------------------------- | ----------------------------------------------------------------------------- |
-| [setup_user_accounts.yml](playbooks/setup_user_accounts.yml)                       | Create OS user accounts a group of servers `target`, which defaults to `all`. |
-| [install_monitoring.yml](playbooks/install_monitoring.yml)                         | Configure a host to collect metrics from client machines.                     |
-| [install_xnat.yml](playbooks/install_xnat.yml)                                     | Install XNAT on two-tier infrastructure.                                      |
-| [install_xnat_container_service.yml](playbooks/install_xnat_container_service.yml) | Install XNAT Container service (Docker host and client).                      |
+| Name                                                         | Description                                                                                   |
+| ------------------------------------------------------------ | --------------------------------------------------------------------------------------------- |
+| [setup_user_accounts.yml](playbooks/setup_user_accounts.yml) | Create OS user accounts a group of servers `target`, which defaults to `all`.                 |
+| [install_monitoring.yml](playbooks/install_monitoring.yml)   | Configure a host to collect metrics from client machines.                                     |
+| [install_xnat.yml](playbooks/install_xnat.yml)               | Install XNAT on two-tier infrastructure with XNAT Container Service (Docker host and client). |
 
 ## External requirements
 

diff --git a/playbooks/install_container_service.yml b/playbooks/install_container_service.yml
diff --git a/playbooks/install_xnat.yml b/playbooks/install_xnat.yml
@@ -34,3 +34,22 @@
   roles:
     - role: mirsg.infrastructure.xnat
     - role: mirsg.infrastructure.firewalld
+
+- name: Setup Container Service on hosts
+  hosts: container_service_host
+  become: true
+  gather_facts: true
+
+  roles:
+    - role: mirsg.infrastructure.provision
+    - role: mirsg.infrastructure.install_python
+    - role: mirsg.infrastructure.docker
+    - role: mirsg.infrastructure.firewalld
+
+- name: Setup Container Service on clients (i.e. the web servers)
+  hosts: container_service_client
+  become: true
+  gather_facts: true
+
+  roles:
+    - role: mirsg.infrastructure.xnat_container_service
diff --git a/playbooks/molecule/resources/xnat/converge.yml b/playbooks/molecule/resources/xnat/converge.yml
@@ -1,6 +1,3 @@
 ---
 - name: Install XNAT
   ansible.builtin.import_playbook: mirsg.infrastructure.install_xnat
-
-- name: Install Container Service
-  ansible.builtin.import_playbook: mirsg.infrastructure.install_container_service