From 1141e2818c46f6b5b71ff30835765a90ec091933 Mon Sep 17 00:00:00 2001
From: pwalczysko <p.walczysko@dundee.ac.uk>
Date: Thu, 14 Nov 2024 19:16:08 +0000
Subject: [PATCH] Cleanup the playbook and try to define root pwd to pass
 signup

---
 molecule/ome-demoserver/molecule.yml |  1 +
 omero/ome-demoserver.yml             | 81 ----------------------------
 2 files changed, 1 insertion(+), 81 deletions(-)

diff --git a/molecule/ome-demoserver/molecule.yml b/molecule/ome-demoserver/molecule.yml
index 22f256da..a6f4041c 100644
--- a/molecule/ome-demoserver/molecule.yml
+++ b/molecule/ome-demoserver/molecule.yml
@@ -41,6 +41,7 @@ provisioner:
         omero_server_dbpassword: omero
         omero_server_mail_from: example.com
         omero_server_mail_host: localhost
+        omero_server_rootpassword: omero
         omero_signup_email_body: 'Thank you for signing up.'
   lint:
     name: ansible-lint
diff --git a/omero/ome-demoserver.yml b/omero/ome-demoserver.yml
index 6b727b3f..3cb79ff8 100644
--- a/omero/ome-demoserver.yml
+++ b/omero/ome-demoserver.yml
@@ -15,88 +15,7 @@
            ((ansible_virtualization_type is defined)
            and (ansible_virtualization_type == "VMware"))
 
-    # # Perhaps alter the role at
-    # # https://github.com/openmicroscopy/ansible-role-lvm-partition/
-    # # to make some of the variables non-required.
-    # - name: Resize root FS without altering mount options
-    #   tags: lvm
-    #   become: true
-    #   lvol:
-    #     lv: root
-    #     vg: VolGroup00
-    #     size: "{{ provision_root_lvsize }}"
-    #     shrink: false
-
-    # - name: Install Make Movie script Prerequisite | MEncoder - Repo
-    #   become: true
-    #   ansible.builtin.yum:
-    #     name: "http://li.nux.ro/download/nux/dextop/el7\
-    #       /x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm"
-    #     state: present
-
-    # - name: Install Make Movie script Prerequisite | MEncoder - Package
-    #   become: true
-    #   ansible.builtin.yum:
-    #     name: mencoder
-    #     state: present
-
-    # - name: Server-side script prerequisites
-    #   become: true
-    #   ansible.builtin.yum:
-    #     name: "{{ item }}"
-    #     state: present
-    #   with_items:
-    #     - mencoder # For the 'make movie' script
-
   roles:
-    # Now OME are using RHEL without Spacewalk, the current best-method of
-    # checking `is server deployed in Dundee/SLS` is
-    # checking for the SLS nameservers.
-    # - role: ome.system_monitor_agent
-    #   tags: monitoring
-    #   when: "'10.1.255.216' in ansible_dns.nameservers"
-
-    # Disk Layout - PostgreSQL | data dir on separate VG (SSD)
-    # - role: ome.lvm_partition
-    #   tags: lvm
-    #   lvm_lvname: pgdata
-    #   lvm_vgname: "{{ provision_postgres_vgname }}"
-    #   lvm_lvmount: /var/lib/pgsql
-    #   lvm_lvsize: "{{ provision_postgres_lvsize }}"
-    #   lvm_lvfilesystem: "{{ filesystem }}"
-    #   lvm_shrink: false
-
-    # # Disk Layout - OMERO | VG and LV (separate disk) for Binary Repository
-    # - role: ome.lvm_partition
-    #   tags: lvm
-    #   lvm_lvname: datadir
-    #   lvm_vgname: "{{ provision_omero_server_datadir_vgname }}"
-    #   lvm_lvmount: "{{ omero_server_datadir }}"
-    #   lvm_lvsize: "{{ provision_omero_server_datadir_lvsize }}"
-    #   lvm_lvfilesystem: "{{ filesystem }}"
-    #   lvm_shrink: false
-
-    # # Disk Layout - OMERO.server | LV for dist & logs
-    # - role: ome.lvm_partition
-    #   tags: lvm
-    #   lvm_lvname: omero_server_basedir
-    #   lvm_vgname: VolGroup00
-    #   lvm_lvmount: "{{ omero_server_basedir }}"
-    #   lvm_lvsize: "{{ provision_omero_server_basedir_lvsize }}"
-    #   lvm_lvfilesystem: "{{ filesystem }}"
-    #   lvm_shrink: false
-
-    # # Disk Layout - OMERO.web | LV for dist & logs
-    # - role: ome.lvm_partition
-    #   tags: lvm
-    #   lvm_lvname: omero_web_basedir
-    #   lvm_vgname: VolGroup00
-    #   lvm_lvmount: "{{ omero_web_basedir }}"
-    #   lvm_lvsize: "{{ provision_omero_web_basedir_lvsize }}"
-    #   lvm_lvfilesystem: "{{ filesystem }}"
-    #   lvm_shrink: false
-
-      # nginx_version: 1.16.1
 
     - role: ome.postgresql
       # no_log: true