From 84f834a9ef9660f38cac1d63f2d705edfeb70253 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Tue, 19 Apr 2022 15:48:20 +0100 Subject: [PATCH 1/7] Defined new group for deploying the searchengine in the pilot IDRs --- ansible/openstack-create-pilotidr-servers.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible/openstack-create-pilotidr-servers.yml b/ansible/openstack-create-pilotidr-servers.yml index 9d0320e2..bbc635eb 100644 --- a/ansible/openstack-create-pilotidr-servers.yml +++ b/ansible/openstack-create-pilotidr-servers.yml @@ -30,6 +30,8 @@ # these hosts in the individual pilot environments - "{{ idr_parent_environment }}-pilotomero-hosts" - "{{ idr_parent_environment }}-pilotdatabase-hosts" + # This extra group controls the deployment of the searchengine app + - "{{ idr_parent_environment }}-searchengine-hosts" idr_vm_networks: > {{ [ {'net-name': idr_parent_environment} ] + ((idr_network_storage | length > 0) | From 64615f72c63e1665c516a949e3dce83abd6665cd Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Wed, 20 Apr 2022 12:55:10 +0100 Subject: [PATCH 2/7] Also define an unprefixed searchengine-hosts group --- ansible/openstack-create-pilotidr-servers.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/openstack-create-pilotidr-servers.yml b/ansible/openstack-create-pilotidr-servers.yml index bbc635eb..ffc51345 100644 --- a/ansible/openstack-create-pilotidr-servers.yml +++ b/ansible/openstack-create-pilotidr-servers.yml @@ -31,6 +31,7 @@ - "{{ idr_parent_environment }}-pilotomero-hosts" - "{{ idr_parent_environment }}-pilotdatabase-hosts" # This extra group controls the deployment of the searchengine app + - searchengine-hosts - "{{ idr_parent_environment }}-searchengine-hosts" idr_vm_networks: > {{ [ {'net-name': idr_parent_environment} ] + From dfb498030bd8d14ef1cb8fb8d130855664cbc0a9 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Wed, 20 Apr 2022 22:37:14 +0100 Subject: [PATCH 3/7] Add pilotidr servers to dockerworker group --- ansible/openstack-create-pilotidr-servers.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/openstack-create-pilotidr-servers.yml b/ansible/openstack-create-pilotidr-servers.yml index ffc51345..cbd3f175 100644 --- a/ansible/openstack-create-pilotidr-servers.yml +++ b/ansible/openstack-create-pilotidr-servers.yml @@ -20,6 +20,7 @@ idr_vm_flavour: "{{ vm_flavour_large }}" idr_vm_database: True idr_vm_omeroreadwrite: True + idr_vm_dockerworker: True idr_vm_extra_groups: - "{{ idr_environment_idr }}-{{ idr_vm_storage_group }}" - "{{ idr_vm_storage_group }}" From d36b52133ad9fb58a5f743569b39f6ae1771daf9 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Thu, 21 Apr 2022 12:26:22 +0100 Subject: [PATCH 4/7] Run idr-docker playbook for all docker-hosts --- ansible/idr-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/idr-docker.yml b/ansible/idr-docker.yml index d5dd5ac4..2a536430 100644 --- a/ansible/idr-docker.yml +++ b/ansible/idr-docker.yml @@ -1,7 +1,7 @@ # Setup IDR Docker nodes - hosts: > - {{ idr_environment | default('idr') }}-dockermanager-hosts + {{ idr_environment | default('idr') }}-docker-hosts roles: - role: ome.docker From b9fa54172613079985e822a4a6a72c4745aa84d5 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Thu, 21 Apr 2022 12:27:34 +0100 Subject: [PATCH 5/7] Consume version of idr.openstack_idr_instance role with group fix --- ansible/requirements.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index f59447c3..3ccccea0 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -134,7 +134,8 @@ # External IDR roles - name: idr.openstack_idr_instance - version: 3.1.1 + src: https://github.com/IDR/ansible-role-openstack-idr-instance/archive/8e8c870a8b1b2509691dc78d4dbd76ff18921cab.tar.gz + version: 3.1.2 - name: idr.openstack_idr_instance_network version: 1.1.2 From 60598d3773a568b56afc6784112f35ae81f2260b Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Thu, 21 Apr 2022 15:45:29 +0100 Subject: [PATCH 6/7] Use idr_environment_idr for search group --- ansible/openstack-create-pilotidr-servers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/openstack-create-pilotidr-servers.yml b/ansible/openstack-create-pilotidr-servers.yml index cbd3f175..42ae1436 100644 --- a/ansible/openstack-create-pilotidr-servers.yml +++ b/ansible/openstack-create-pilotidr-servers.yml @@ -33,7 +33,7 @@ - "{{ idr_parent_environment }}-pilotdatabase-hosts" # This extra group controls the deployment of the searchengine app - searchengine-hosts - - "{{ idr_parent_environment }}-searchengine-hosts" + - "{{ idr_environment_idr }}-searchengine-hosts" idr_vm_networks: > {{ [ {'net-name': idr_parent_environment} ] + ((idr_network_storage | length > 0) | From 0fb4d4d1e097350fca93a333a57a87dd27d20fc7 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Tue, 3 May 2022 13:26:38 +0100 Subject: [PATCH 7/7] Use released version of idr.openstack_idr_instance role --- ansible/requirements.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 3ccccea0..85859c2d 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -134,7 +134,6 @@ # External IDR roles - name: idr.openstack_idr_instance - src: https://github.com/IDR/ansible-role-openstack-idr-instance/archive/8e8c870a8b1b2509691dc78d4dbd76ff18921cab.tar.gz version: 3.1.2 - name: idr.openstack_idr_instance_network