From 0f7f4a5ec12aa00623665170794c39da47330614 Mon Sep 17 00:00:00 2001
From: Benjamin Saiz <bsz@cloud-temple.com>
Date: Tue, 27 Jul 2021 11:05:13 +0200
Subject: [PATCH] Allow services overrides and enforce harbor_data_dev check

---
 tasks/main.yml                           | 14 +++++++++++---
 templates/docker-compose.override.yml.j2 |  3 +++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 templates/docker-compose.override.yml.j2

diff --git a/tasks/main.yml b/tasks/main.yml
index 9620827..ad1e738 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -27,7 +27,7 @@
   filesystem:
     fstype: "{{ harbor_data_fstype }}"
     dev: "{{ harbor_data_dev }}"
-  when: harbor_data_dev != ""
+  when: harbor_data_dev is defined and harbor_data_dev != ""
   become: yes
 
 - name: Mount disk for data dir
@@ -36,7 +36,7 @@
     src: "{{ harbor_data_dev }}"
     fstype: "{{ harbor_data_fstype }}"
     state: mounted
-  when: harbor_data_dev != ""
+  when: harbor_data_dev is defined and harbor_data_dev != ""
   become: yes
 
 - name: "Downloading Harbor {{ harbor_version }} (offline installer)"
@@ -73,13 +73,21 @@
   become: yes
   register: config
 
+- name: "Add service Overrides"
+  template:
+    src: docker-compose.override.yml.j2
+    dest: "{{ harbor_install_dir }}/harbor/docker-compose.override.yml"
+  become: yes
+  when: harbor_services_overrides is defined and harbor_services_overrides != ''
+  register: overrides
+
 - name: Running Harbor installer...
   command: "./install.sh {{ harbor_installer_with }} {{ harbor_installer_extra_args }}"
   args:
     chdir: "{{ harbor_install_dir }}/harbor"
     creates: '{{ harbor_install_dir }}/harbor/harbor_install_log.txt'
   become: yes
-  when: config is changed
+  when: config is changed or overrides is changed
 
 - name: Creating projects
   uri:
diff --git a/templates/docker-compose.override.yml.j2 b/templates/docker-compose.override.yml.j2
new file mode 100644
index 0000000..caede91
--- /dev/null
+++ b/templates/docker-compose.override.yml.j2
@@ -0,0 +1,3 @@
+version: '2.3'
+services:
+  {{ harbor_services_overrides | to_nice_yaml(indent=2) | indent(2) }}