From 21a2d7c0a7017eb1490914dfd07e5ae82b24d734 Mon Sep 17 00:00:00 2001
From: WeiLai <imwl@live.com>
Date: Fri, 16 Dec 2022 09:24:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=20harbor=20?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E8=B7=AF=E5=BE=84=20(#1209)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/config.yml                        |  1 +
 roles/harbor/tasks/main.yml               | 20 ++++++++++----------
 roles/harbor/templates/harbor-v2.1.yml.j2 |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/example/config.yml b/example/config.yml
index b7a1d82..6c98f4e 100644
--- a/example/config.yml
+++ b/example/config.yml
@@ -198,6 +198,7 @@ network_check_schedule: "*/5 * * * *"
 # harbor version，完整版本号
 HARBOR_VER: "__harbor__"
 HARBOR_DOMAIN: "harbor.easzlab.io.local"
+HARBOR_PATH: /var/data
 HARBOR_TLS_PORT: 8443
 
 # if set 'false', you need to put certs named harbor.pem and harbor-key.pem in directory 'down'
diff --git a/roles/harbor/tasks/main.yml b/roles/harbor/tasks/main.yml
index 369cec3..e1dfd37 100644
--- a/roles/harbor/tasks/main.yml
+++ b/roles/harbor/tasks/main.yml
@@ -1,12 +1,12 @@
-- name: 创建 /var/data 目录
+- name: 创建 {{ HARBOR_PATH }} 目录
   file:
-    path: /var/data
+    path: "{{ HARBOR_PATH }}"
     state: directory
     mode: 0755
 
-# 注册变量 result，如果 /var/data 目录下存在 registry 目录说明已经安装过 harbor，则不进行安装
+# 注册变量 result，如果 {{ HARBOR_PATH }} 目录下存在 registry 目录说明已经安装过 harbor，则不进行安装
 - name: 注册变量 result
-  command: ls /var/data
+  command: ls {{ HARBOR_PATH }}
   register: result
 
 - block:
@@ -28,13 +28,13 @@
   - name: 下发 harbor 离线安装包
     copy:
       src: "{{ base_dir }}/down/harbor-offline-installer-{{ HARBOR_VER }}.tgz"
-      dest: "/var/data/harbor-offline-installer-{{ HARBOR_VER }}.tgz"
+      dest: "{{ HARBOR_PATH }}/harbor-offline-installer-{{ HARBOR_VER }}.tgz"
 
   - name: 解压 harbor 离线安装包
-    shell: "cd /var/data && tar zxf harbor-offline-installer-{{ HARBOR_VER }}.tgz"
+    shell: "cd {{ HARBOR_PATH }} && tar zxf harbor-offline-installer-{{ HARBOR_VER }}.tgz"
 
   - name: 导入 harbor 所需 docker images
-    shell: "{{ bin_dir }}/docker load -i /var/data/harbor/harbor.{{ HARBOR_VER }}.tar.gz"
+    shell: "{{ bin_dir }}/docker load -i {{ HARBOR_PATH }}/harbor/harbor.{{ HARBOR_VER }}.tar.gz"
   
   - block:
     - name: 创建 harbor 证书请求
@@ -65,10 +65,10 @@
     when: 'not HARBOR_SELF_SIGNED_CERT|bool'
   
   - name: 准备 harbor 配置文件
-    template: src=harbor-{{ HARBOR_VER_MAIN }}.yml.j2 dest=/var/data/harbor/harbor.yml
+    template: src=harbor-{{ HARBOR_VER_MAIN }}.yml.j2 dest={{ HARBOR_PATH }}/harbor/harbor.yml
 
     #- name: 配置 harbor.yml 文件
-    #template: src=harbor-{{ HARBOR_VER_MAIN }}.yml.j2 dest=/var/data/harbor/harbor.yml
+    #template: src=harbor-{{ HARBOR_VER_MAIN }}.yml.j2 dest={{ HARBOR_PATH }}/harbor/harbor.yml
     #when: HARBOR_VER_MAIN in ["v1.8", "v1.9", "v1.10"]
 
   - set_fact: HARBOR_INST_OPS="{{ HARBOR_INST_OPS }} --with-chartmuseum"
@@ -86,7 +86,7 @@
   - debug: var="HARBOR_INST_OPS"
 
   - name: 安装 harbor
-    shell: "cd /var/data/harbor && \
+    shell: "cd {{ HARBOR_PATH }}/harbor && \
             export PATH={{ bin_dir }}:$PATH && \
             ./install.sh {{ HARBOR_INST_OPS }} >> /tmp/harbor-`date +'%Y%m%d%H%M%S'`.log 2>&1"
   when: '"registry" not in result.stdout'
diff --git a/roles/harbor/templates/harbor-v2.1.yml.j2 b/roles/harbor/templates/harbor-v2.1.yml.j2
index 8e21ab7..a28a6b3 100644
--- a/roles/harbor/templates/harbor-v2.1.yml.j2
+++ b/roles/harbor/templates/harbor-v2.1.yml.j2
@@ -27,7 +27,7 @@ database:
   max_open_conns: 1000
 
 # The default data volume
-data_volume: /var/data
+data_volume: {{ HARBOR_PATH }}
 
 # Clair configuration
 clair: