简化ansible hosts中 harbor变量配置

551685830 · Aug 23, 2018 · c911d2f · c911d2f
1 parent 0036c62
commit c911d2f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 24 deletions.
diff --git a/11.harbor.yml b/11.harbor.yml
@@ -10,17 +10,19 @@
   - new-master
   - kube-node
   - new-node
+  vars:
+    harbor_domain: "{{ hostvars[groups.harbor[0]]['HARBOR_DOMAIN'] }}"
   tasks:
   - name: harbor证书目录创建
-    file: name=/etc/docker/certs.d/{{ HARBOR_DOMAIN }} state=directory
+    file: name=/etc/docker/certs.d/{{ harbor_domain }} state=directory
 
   - name: harbor服务器证书安装
-    copy: src={{ ca_dir }}/ca.pem dest=/etc/docker/certs.d/{{ HARBOR_DOMAIN }}/ca.crt
+    copy: src={{ ca_dir }}/ca.pem dest=/etc/docker/certs.d/{{ harbor_domain }}/ca.crt
 
   # 如果你的环境中有dns服务器，可以跳过hosts文件设置
   - name: 增加harbor的hosts解析
     lineinfile:
       dest: /etc/hosts
       state: present
-      regexp: '{{ HARBOR_DOMAIN }}'
-      line: '{{ HARBOR_IP }} {{ HARBOR_DOMAIN }}'
+      regexp: '{{ harbor_domain }}'
+      line: "{{ groups['harbor'][0] }} {{ harbor_domain }}"
diff --git a/docs/guide/harbor.md b/docs/guide/harbor.md
@@ -19,11 +19,7 @@ mv docker-compose-Linux-x86_64 /etc/ansible/bin/docker-compose
 ``` bash
 # 如果启用harbor，请配置后面harbor相关参数
 [harbor]
-192.168.1.8
-
-#私有仓库 harbor服务器 (域名或者IP)
-HARBOR_IP="192.168.1.8"
-HARBOR_DOMAIN="harbor.test.com"
+192.168.1.8 HARBOR_DOMAIN="harbor.yourdomain.com"
 ```
 
 4. 在deploy节点执行 `cd /etc/ansible && ansible-playbook 11.harbor.yml`，完成harbor安装

diff --git a/example/hosts.allinone.example b/example/hosts.allinone.example
@@ -15,7 +15,7 @@
 
 # 如果启用harbor，请配置后面harbor相关参数
 [harbor]
-#192.168.1.8
+#192.168.1.8 HARBOR_DOMAIN="harbor.yourdomain.com"
 
 # 预留组，后续添加node节点使用
 [new-node]
@@ -70,7 +70,3 @@ ca_dir="/etc/kubernetes/ssl"
 
 #部署目录，即 ansible 工作目录
 base_dir="/etc/ansible"
-
-#私有仓库 harbor服务器 (域名或者IP)
-#HARBOR_IP="192.168.1.8"
-#HARBOR_DOMAIN="harbor.yourdomain.com"
diff --git a/example/hosts.m-masters.example b/example/hosts.m-masters.example
@@ -24,7 +24,7 @@
 
 # 如果启用harbor，请配置后面harbor相关参数
 [harbor]
-#192.168.1.8
+#192.168.1.8 HARBOR_DOMAIN="harbor.yourdomain.com"
 
 # 预留组，后续添加master节点使用
 [new-master]
@@ -84,7 +84,3 @@ ca_dir="/etc/kubernetes/ssl"
 
 #部署目录，即 ansible 工作目录，建议不要修改
 base_dir="/etc/ansible"
-
-#私有仓库 harbor服务器 (域名或者IP)
-#HARBOR_IP="192.168.1.8"
-#HARBOR_DOMAIN="harbor.yourdomain.com"
diff --git a/example/hosts.s-master.example b/example/hosts.s-master.example
@@ -16,7 +16,7 @@
 
 # 如果启用harbor，请配置后面harbor相关参数
 [harbor]
-#192.168.1.8
+#192.168.1.8 HARBOR_DOMAIN="harbor.yourdomain.com"
 
 # 预留组，后续添加node节点使用
 [new-node]
@@ -71,7 +71,3 @@ ca_dir="/etc/kubernetes/ssl"
 
 #部署目录，即 ansible 工作目录
 base_dir="/etc/ansible"
-
-#私有仓库 harbor服务器 (域名或者IP)
-#HARBOR_IP="192.168.1.8"
-#HARBOR_DOMAIN="harbor.yourdomain.com"