wip: try combination of gitlab_additional_configurations

Author: tobiashuste

roles/gitlab/defaults/main.yml

@@ -64,6 +64,12 @@ gitlab_secret_token: "changeme"
 gitlab_gitaly_instance_ip: "127.0.0.1"
 # Port of the Gitaly instance
 gitlab_gitaly_instance_port: "8075"
+# Configure Gitaly data directory
+gitlab_gitaly_data_dir_config:
+  configuration:
+    storage:
+      - name: "default"
+        path: "{{ (gitlab_git_data_dir, 'repositories') | path_join }}"
 
 # Whether to use GitLab Omnibus internal PostgreSQL database
 gitlab_use_internal_postgresql: "true"
@@ -93,4 +99,6 @@ gitlab_mattermost_only_context: "false"
 
 gitlab_feature_flags: []
 
+gitlab_additional_configurations: []
+
 ...

roles/gitlab/tasks/configure.yml

@@ -19,6 +19,31 @@
     - "Reconfigure Primary GitLab"
     - "Reconfigure Non Primary GitLab"
 
+- name: "Merge existing gitaly configuration"
+  when:
+    - "gitlab_additional_configurations | length > 0"
+    - "gitlab_additional_configurations.gitaly is defined"
+    - "gitlab_additional_configurations.gitaly.configuration is defined"
+    - "gitlab_use_internal_gitaly"
+  ansible.builtin.set_fact:
+    gitlab_additional_configurations.gitaly.configuration: "{{ gitlab_gitaly_data_dir_config | ansible.builtin.combine(gitlab_additional_configurations.gitaly, recursive=True) }}"
+
+- name: "Append gitaly configuration"
+  when:
+    - "gitlab_additional_configurations | length > 0"
+    - "gitlab_additional_configurations.gitaly is not defined"
+    - "gitlab_additional_configurations.gitaly.configuration is not defined"
+  ansible.builtin.set_fact:
+    gitlab_additional_configurations: "{{ gitlab_additional_configurations + [gitlab_gitaly_data_dir_config] }}"
+
+- name: "Use gitaly data dir config if additional config is empty"
+  when:
+    - "gitlab_additional_configurations | length == 0"
+  ansible.builtin.set_fact:
+    gitlab_additional_configurations:
+      - gitaly:
+          gitlab_gitaly_data_dir_config
+
 - name: "Copy GitLab Configuration File."
   become: true
   ansible.builtin.template: