Resolve "include nextcloud-collabora integration"

ansible/group_vars/all.yml

@@ -5,8 +5,11 @@ ansible_python_interpreter: "/usr/bin/env python3"
 # generated and stored in `secrets/nextcloud_admin_password`. You can also choose
 # your own password and fill it in here instead.
 nextcloud_password: "{{ lookup('password', './secrets/nextcloud_admin_password chars=ascii_letters') }}"
+nextcloud_mariadb_password: "{{ lookup('password', './secrets/nextcloud_mariadb_password chars=ascii_letters') }}"
+nextcloud_mariadb_root_password: "{{ lookup('password', './secrets/nextcloud_mariadb_root_password chars=ascii_letters') }}"
+collabora_password: "{{ lookup('password', './secrets/collabora_admin_password chars=ascii_letters') }}"
 
 # git repo versions
-git_helmfiles_version: '67a3c9df68e96df2d50e9b3eb41b3e60fd7e58f7'
+git_helmfiles_version: 'e7fc50faf5c0bf7af0a55c43ec91a250481ba926'
 git_charts_version: 'HEAD'
 git_local_storage_version: 'HEAD'

ansible/roles/configure/tasks/main.yml

@@ -38,12 +38,17 @@
     state: directory
     path: /root/.helm/plugins
 
-- name: Install diff helm plugin
-  # helm needs to get install as "classic" snap
+- name: Install helm diff plugin
   command: /snap/bin/helm plugin install https://github.com/databus23/helm-diff
   args:
     creates: /root/.helm/plugins/helm-diff
 
+- name: Install helm git plugin
+  # Use GH version until https://github.com/aslafy-z/helm-git/pull/11 is merged
+  command: /snap/bin/helm plugin install https://github.com/greenhost/helm-git --version bash-support
+  args:
+    creates: /root/.helm/plugins/helm-git
+
 - name: Install kubectl snap
   # kubectl needs to get installed as "classic" snap
   command: snap install --classic kubectl

ansible/roles/setup/tasks/main.yml

@@ -231,6 +231,9 @@
   tags:
     - helmfile
   environment:
+    - COLLABORA_PASSWORD: "{{ collabora_password }}"
     - NEXTCLOUD_PASSWORD: "{{ nextcloud_password }}"
+    - NEXTCLOUD_MARIADB_PASSWORD: "{{ nextcloud_mariadb_password }}"
+    - NEXTCLOUD_MARIADB_ROOT_PASSWORD: "{{ nextcloud_mariadb_root_password }}"
   command: '/usr/local/bin/helmfile -b /snap/bin/helm -e oas -f /oas/source/repos/helmfiles/helmfile.d/ apply --suppress-secrets'
 

test/ci-bootstrap.py

@@ -140,7 +140,7 @@ def main():  # pylint: disable=too-many-statements,too-many-branches
                 ssh_key_id=args.ssh_key_id,
                 region='ams1',
                 size=4096,
-                disk=8,
+                disk=10,
                 image=15)
             droplet_id = droplet['droplet']['id']
             log.info('Created droplet id: %s', droplet_id)