diff --git a/ansible/idr-01-install-idr.yml b/ansible/idr-01-install-idr.yml index 5ec96229..9519bd50 100644 --- a/ansible/idr-01-install-idr.yml +++ b/ansible/idr-01-install-idr.yml @@ -8,10 +8,10 @@ - import_playbook: idr-omero.yml -- import_playbook: idr-omero-web.yml - - import_playbook: idr-omero-readonly.yml +- import_playbook: idr-omero-web.yml + tags: # Requires NFS shares which can't be configured in Docker - skip_if_molecule_docker diff --git a/ansible/idr-omero-readonly.yml b/ansible/idr-omero-readonly.yml index 62942c64..2fc76b0b 100644 --- a/ansible/idr-omero-readonly.yml +++ b/ansible/idr-omero-readonly.yml @@ -16,6 +16,7 @@ mode: 0755 roles: + - role: ome.nfs_share nfs_shares: /data/OMERO: @@ -185,7 +186,6 @@ '[},]' )) - - hosts: "{{ idr_environment | default('idr') }}-omeroreadonly-hosts" tasks: - name: Get database host @@ -195,7 +195,6 @@ '-database-hosts'][0]][ 'ansible_' + (idr_net_iface | default('eth0'))]['ipv4']['address'] }} - - hosts: > {{ idr_environment | default('idr') }}-omeroreadonly-hosts @@ -238,15 +237,3 @@ path: "{{ omero_common_basedir }}/server/OMERO.server/lib/scripts/omero" state: absent notify: restart omero-server - -# deploy ms -# This will modify the omero web nginx configuration file -# It should be executed after running idr-omero-web.yml -# as it is in idr-01-install-idr.yml -- hosts: "{{ idr_environment | default('idr') }}-omeroreadonly-hosts" - become: true - - roles: - - role: ome.omero_ms_image_region - - environment: "{{ idr_ANSIBLE_ENVIRONMENT_VARIABLES | default({}) }}" diff --git a/ansible/idr-omero-web.yml b/ansible/idr-omero-web.yml index c9dff70a..6a78d419 100644 --- a/ansible/idr-omero-web.yml +++ b/ansible/idr-omero-web.yml @@ -18,15 +18,15 @@ - hosts: "{{ idr_environment | default('idr') }}-omeroreadonly-hosts" become: true - pre_tasks: - - name: check if ms user exist - ansible.builtin.user: - name: "omero-server" - check_mode: true - register: service_user +# pre_tasks: +# - name: check if ms user exist +# ansible.builtin.user: +# name: "omero-server" +# check_mode: true +# register: service_user roles: - role: ome.omero_ms_image_region - when: "{{ service_user.state | d('') == 'present' }}" +# when: "{{ service_user.state | d('') == 'present' }}" environment: "{{ idr_ANSIBLE_ENVIRONMENT_VARIABLES | default({}) }}"