From 9565e484edab487cb8ae7dc1c151ad1bfe40deb1 Mon Sep 17 00:00:00 2001
From: jianlong <jianlong.zhang@baifendian.com>
Date: Tue, 24 Aug 2021 11:10:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=AE=89=E8=A3=85ansible(=E6=9C=AC=E5=9C=B0y?=
 =?UTF-8?q?um=E6=BA=90=E7=9A=84=E6=96=B9=E5=BC=8F=E5=AE=9E=E7=8E=B0)=202.?=
 =?UTF-8?q?=20=E6=8A=BD=E5=8F=96=E5=90=8E=E7=9A=84=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E6=94=BE=E5=9B=9E=E5=90=84=E8=87=AA=E7=9A=84roles=E4=B8=AD(?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=8D=E6=83=B3=E5=AF=B9=E5=AE=A2=E6=88=B7=E6=9A=B4?=
 =?UTF-8?q?=E9=9C=B2)=203.=20clickhous=E5=88=9D=E5=A7=8B=E5=8C=96=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E5=85=B3=E4=BA=8Ebifang-maridb=E7=9A=84=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=8F=98=E9=87=8F=E5=8C=96=204.=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=B0=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  92 ++++-
 README.md                                     |   3 +-
 install.sh                                    |  40 +-
 inventories/pro/group_vars/all                | 353 +-----------------
 inventories/pro/hosts                         |  41 +-
 .../roles/check/check-services/tasks/main.yml |   2 +-
 .../roles/components/arangodb/vars/main.yml   |  21 ++
 .../clickhouse/common/vars/main.yml           |  11 +
 .../components/clickhouse/data/vars/main.yml  |  11 +
 .../components/clickhouse/query/vars/main.yml |  11 +
 .../components/druid/tasks/install_druid.yml  |   2 +-
 parcels/roles/components/druid/vars/main.yml  |   5 +
 .../hadoop/tasks/install_hadoop.yml           |   2 +-
 parcels/roles/components/hadoop/vars/main.yml |   2 +
 .../components/hbase/tasks/install_hbase.yml  |   2 +-
 parcels/roles/components/hbase/vars/main.yml  |   2 +
 .../components/kafka/tasks/install_kafka.yml  |   4 +-
 parcels/roles/components/kafka/vars/main.yml  |  11 +
 .../{file => files}/slow_query.log            |   0
 .../tasks/install-mariadb.yml                 |   2 +-
 .../install-mariadb-cluster/vars/main.yml     |   2 +
 .../components/nacos/tasks/install_nacos.yml  |   2 +-
 .../nacos/templates/application.properties.j2 |   4 +-
 parcels/roles/components/nacos/vars/main.yml  |   5 +
 .../components/spark/tasks/install_spark.yml  |   4 +-
 parcels/roles/components/spark/vars/main.yml  |   6 +
 .../components/storm/tasks/install_storm.yml  |   2 +-
 parcels/roles/components/storm/vars/main.yml  |   2 +
 parcels/roles/components/test/vars/main.yml   |   8 +
 .../components/zookeeper/tasks/install_zk.yml |   2 +-
 .../roles/components/zookeeper/vars/main.yml  |   7 +
 .../dependencies/check-env/vars/main.yml      |   3 +
 .../dependencies/install-jdk/vars/main.yml    |   3 +
 .../init/clickhouse/tasks/init_clickhouse.yml |   4 +-
 .../{files => templates}/create_ck_table.sql  |   6 +-
 .../create_ck_table.sql_21.06                 |   0
 .../clickhouse/{files => templates}/dll.sql   |   0
 .../templates/check_gateway.sh.j2             |  12 +-
 .../galaxy-gateway-keepalive/vars/main.yml    |   4 +
 .../services/galaxy-chproxy/vars/main.yml     |  19 +
 .../galaxy-gateway-keepalive/vars/main.yml    |   4 +
 .../galaxy-gateway-nginx/vars/main.yml        |  17 +
 .../services/galaxy-gohangout/vars/main.yml   |  17 +
 .../galaxy-hos-keepalive/vars/main.yml        |   4 +
 .../services/galaxy-hos-nginx/vars/main.yml   |  17 +
 .../galaxy-hos-service/tasks/load_hos.yml     |  24 +-
 .../templates/docker-compose.yml.j2           |   2 +-
 .../services/galaxy-hos-service/vars/main.yml |  18 +
 .../galaxy-job-service/tasks/load_admin.yml   |   2 +-
 .../services/galaxy-job-service/vars/main.yml |  25 ++
 .../services/galaxy-qgw-service/vars/main.yml |  20 +
 .../galaxy-report-service/vars/main.yml       |  19 +
 52 files changed, 478 insertions(+), 403 deletions(-)
 rename parcels/roles/components/mariadb/install-mariadb-cluster/{file => files}/slow_query.log (100%)
 rename parcels/roles/init/clickhouse/{files => templates}/create_ck_table.sql (99%)
 rename parcels/roles/init/clickhouse/{files => templates}/create_ck_table.sql_21.06 (100%)
 rename parcels/roles/init/clickhouse/{files => templates}/dll.sql (100%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 52d3c72..5fd104c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,17 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="55c8c5b9-9b57-431e-a0ed-0064b85979fa" name="Default Changelist" comment="" />
+    <list default="true" id="55c8c5b9-9b57-431e-a0ed-0064b85979fa" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/install.sh">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="330">
+              <caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="22" selection-end-column="10" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="FIRST">
+              <first_editor relative-caret-position="960">
+                <caret line="64" column="27" selection-start-line="64" selection-start-column="27" selection-end-line="64" selection-end-column="27" />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
   <component name="Git.Settings">
     <option name="ROOT_SYNC" value="DONT_SYNC" />
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="PUSH_TAGS">
+      <GitPushTagMode />
+    </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/README.md" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds" fullScreen="true">
     <option name="width" value="2560" />
     <option name="height" value="1440" />
   </component>
@@ -24,8 +62,8 @@
         <subPane>
           <expand>
             <path>
-              <item name="Galaxy-auto-deploy-cluster-21.07" type="b2602c69:ProjectViewProjectNode" />
-              <item name="Galaxy-auto-deploy-cluster-21.07" type="462c0819:PsiDirectoryNode" />
+              <item name="Galaxy-auto-deploy-cluster" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Galaxy-auto-deploy-cluster" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -64,24 +102,21 @@
       <option name="presentableId" value="Default" />
       <updated>1629364019161</updated>
       <workItem from="1629364020595" duration="323000" />
+      <workItem from="1629365110577" duration="847000" />
+      <workItem from="1629771678937" duration="537000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="323000" />
+    <option name="totallyTimeSpent" value="1707000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="2560" height="1440" extended-state="6" />
+    <frame x="0" y="0" width="2560" height="1440" extended-state="0" />
+    <editor active="true" />
     <layout>
-      <window_info id="Favorites" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24980143" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25377283" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Python Console" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
@@ -89,14 +124,39 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="SciView" />
-      <window_info anchor="right" id="Database" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" visible="true" weight="0.30145985" />
+      <window_info anchor="bottom" id="Database Changes" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Terminal" order="11" weight="0.329927" />
+      <window_info anchor="bottom" id="Python Console" order="12" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="SciView" order="3" />
+      <window_info anchor="right" id="Database" order="4" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/install.sh">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="22" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="FIRST">
+          <first_editor relative-caret-position="960">
+            <caret line="64" column="27" selection-start-line="64" selection-start-column="27" selection-end-line="64" selection-end-column="27" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+  </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 2831d45..f7ce327 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,6 @@ inventories/pro/hosts
 
 - 所有role(主机)使用的变量
 inventories/pro/group_vars/all
-新开发的role的变量可定义到此文件中统一管理, 已存在的role的变量直接修改此文件即可
 `注意`: 新增变量名不可与已有变量发生重复
 
 - 部署包目录
@@ -76,4 +75,4 @@ software_packages
 
 2. 视情况修改 inventories/pro/group_vars/all 里的相关配置
 
-3. 确实好配置后执行 "sh install.sh" 进行安装
+3. 确认好配置后执行 "sh install.sh" 进行安装
diff --git a/install.sh b/install.sh
index e5c22f9..c34fb53 100755
--- a/install.sh
+++ b/install.sh
@@ -1,9 +1,19 @@
 #!/bin/bash
 
+
+#######################基础变量######################
+#脚本目录
+bin_path=$(cd `dirname $0`; pwd)
+#脚本目录的上层目录
+base_path=$(cd `dirname $0`/..; pwd)
+#uuid
+uuid=`uuidgen`
+
 NUM_DIR="/usr/galaxyinstmp"
 if [ ! -d "$NUM_DIR/" ];then
   mkdir -p $NUM_DIR/
 fi
+#######################基础变量######################
 
 cd parcels
 
@@ -12,7 +22,7 @@ echo "Check whether the current executor has Docker and Ansible environment, if
 echo -e "\033[31;1mThe process may prompt command not found error, please ignore it.\033[0m"
 
 sleep 2
-a=`docker -v`
+a=`docker -v 2>/dev/null`
 hasDocker=$?
 if [[ $hasDocker != '0' ]]; then
     echo "
@@ -27,13 +37,32 @@ else
 
 fi
 
-a=`ansible --version`
+
+a=`ansible --version 2>/dev/null`
 hasAnsible=$?
 if [[ $hasAnsible != '0' ]]; then
     echo "
   "
-  echo -e "\033[31;1mThis Ansible not installed, Please install\033[0m"
-  exit 1
+  echo -e "\033[31;1mThis Ansible not installed, beginning install . . . \033[0m"
+  mkdir /etc/yum.repos.d/bak_`date '+%Y-%m-%d'`
+  mv /etc/yum.repos.d/*.repo /etc/yum.repos.d/bak_`date '+%Y-%m-%d'`
+  cp ${bin_path}/software_packages/ansible/ansible.repo /etc/yum.repos.d/
+  sed -i -e "s#s_ansible_rpm_dir#${bin_path}#g" /etc/yum.repos.d/ansible.repo
+  yum clean all && yum makecache
+  yum -y -q install ansible
+
+  if [ $? == 0 ]; then
+    mv /etc/yum.repos.d/bak_`date '+%Y-%m-%d'`/* /etc/yum.repos.d/
+    rm -r /etc/yum.repos.d/bak_`date '+%Y-%m-%d'`
+    echo -e "\033[32;1mThis Ansible installed, the version is:\033[0m"
+    ansible --version
+    echo 1 > $NUM_DIR/checkManager
+  else
+    mv /etc/yum.repos.d/bak_`date '+%Y-%m-%d'`/* /etc/yum.repos.d/
+    rm -r /etc/yum.repos.d/bak_`date '+%Y-%m-%d'`
+    echo -e "\033[32;1mThis Ansible not installed, please check it manually\033[0m"
+    exit 1
+  fi
 else
   echo "
   "
@@ -41,6 +70,7 @@ else
   ansible --version
   echo 1 > $NUM_DIR/checkManager
 fi
+
 sleep 5
 }
 
@@ -302,7 +332,7 @@ function installAllApps() {
 clear
 
 i=0
-hoskeep=`cat ../inventories/pro/config.yml  | grep "hos_keepalive_need: yes" | wc -l`
+hoskeep=`cat ../inventories/pro/group_vars/all | grep -vE "^#|^$" | grep "hos_keepalive_need" | grep yes | wc -l`
 if [[ $hoskeep -eq "1" ]]; then
   ins_names=(galaxy-gateway-nginx galaxy-qgw-service galaxy-job-service galaxy-report-service galaxy-hos-service galaxy-chproxy galaxy-hos-nginx galaxy-hos-keepalive galaxy-gohangout)
 else
diff --git a/inventories/pro/group_vars/all b/inventories/pro/group_vars/all
index 7a80fa4..f6ff059 100644
--- a/inventories/pro/group_vars/all
+++ b/inventories/pro/group_vars/all
@@ -20,10 +20,17 @@ data_path: /home/ceiec
 #仅限本安装包部署的组件。
 allowed_unload: "yes"
 
+# 所有安装包路径,可自己指定绝对路径
+package_path: "{{ playbook_dir | dirname }}/software_packages"
+#package_path: /opt/software_packages
+
 #============================bifang-Mariadb===============================#
 
-#Bifang MariaDB 地址，用以galaxy-qgw-service、galaxy-report-service的业务使用。
-bifang_mariadb_host: 127.0.0.1
+#Bifang MariaDB 地址，用于galaxy-qgw-service、galaxy-report-service的业务使用。
+bifang_mariadb_host: 192.168.40.153
+
+#Bifang mariadb 端口
+bifang_mariadb_port: 3306
 
 #Bifang mariadb 数据库名
 bifang_mariadb_database: tsg-bifang
@@ -31,23 +38,16 @@ bifang_mariadb_database: tsg-bifang
 #Bifang mariadb pin
 bifang_mariadb_pin: 111111
 
-
 #galaxy mariadb key
 galaxy_mariadb_pin: ceiec2019
 
 
-# 所有安装包路径,可自己指定绝对路径
-package_path: "{{ playbook_dir | dirname }}/software_packages"
-#package_path: /opt/software_packages
-
-
-
 #============================虚IP===============================#
 
 #-------------apps------------------#
 
 #Galaxy 业务组件keepalive IP地址,填写的IP只能是和hosts-services配置的IP是同段的，且不能跟同段内已有的IP相同。
-gateway_keepalive_host: 192.168.44.23
+gateway_keepalive_host: 192.168.45.252
 
 #Galaxy 业务组件keepalive绑定网卡名称，不支持两个服务器网卡名称不同的情况，此情况需要安装完成后手动修改配置文件
 gateway_keepalive_interface: eth0
@@ -62,7 +62,7 @@ hos_keepalive_need: "yes"
 
 #galaxy-hos-service服务keepalive IP地址 若 hos_keepalive_need为no，则此处填写gateway_keepalive_host对应的IP
 #填写的IP只能是和hosts-hoskeepalive配置的IP是同段的，且不能跟同段内已有的IP相同。
-hos_keepalive_host: 127.0.0.2
+hos_keepalive_host: 192.168.45.253
 
 #galaxy-hos-service服务keepalive绑定网卡名称，不支持两个服务器网卡名称不同的情况，此情况需要安装完成后手>动修改配置文件
 #若 hos_keepalive_need 配置no则此处 可不进行修改
@@ -73,18 +73,13 @@ hos_keepalive_interface: eth0
 hos_keepalive_router_id: 62
 
 
-#galaxy-keepalive的相关路径(目前gateway和hos共用这个配置)
-keepalived_package_path: /home/keepalive
-
-keepalived_soft_home_path: galaxy/workspace/
-
 
 #============================Kafka===============================#
 #任务消费kafka地址,若无特殊情况为本安装集群kafka地址，格式:kafkaip1:9092,kafkaip2:9092,kafkaip3:9092.....
-consumer_kafka_servers: 127.0.0.1:9092
+consumer_kafka_servers: 192.168.45.37:9092,192.168.45.38:9092,192.168.45.39:9092
 
 #任务结果写入kafka地址,若无特殊情况为本安装集群kafka地址，格式:kafkaip1:9092,kafkaip2:9092,kafkaip3:9092.....
-producer_kafka_servers: 127.0.0.1:9092
+producer_kafka_servers: 192.168.45.37:9092,192.168.45.38:9092,192.168.45.39:9092
 
 #============================默认配置===============================#
 #自研服务组件使用nacos 命名空间名称
@@ -293,325 +288,3 @@ job_java_opts: "-Xmx512m -Xms512m"
 report_java_opts: "-Xmx512m -Xms512m"
 
 
-
-
-
-
-
-
-########################
-#####               ####
-#####   开发者配置  ####
-#####               ####
-########################
-
-#------zookeeper---------#
-zookeeper_version: zookeeper-3.4.10
-
-#zookeeper myid起始id，如不是扩容则此处无需修改；若为扩容，则此处改为原集群节点 myid最大值+1
-zk_start_myid: 1
-
-#zookeeper port
-zookeeper_port: 2181
-
-
-#------mariadb---------#
-#mariadb数据目录
-mariadb_datadir_path: /data/mariadb
-
-
-
-#-----nacos---------#
-#nacos version
-nacos_version: nacos-2.0.2
-
-#nacos local port
-nacos_port: 8847
-
-
-
-#-----kafka---------#
-#Kafka版本
-kafka_version: kafka_2.11-1.0.0
-
-#kafka-manager 版本
-kafka_manager_version: kafka-manager-1.3.3.18
-
-#kafka broker起始id
-kafka_start_broker: 1
-
-#kafka default port
-server_port: 9092
-
-
-
-#------storm---------#
-storm_version: apache-storm-1.0.2
-
-
-
-#-------hadoop---------#
-hadoop_version: hadoop-2.7.1
-
-
-
-#--------Hbase---------#
-hbase_version: hbase-2.2.3
-
-
-#------Clickhouse---------#
-#clickhouse 版本
-clickhouse_version: 20.3.12.112
-
-#clickhouse默认的数据库
-default_database: default
-
-#clickhouse 只读key
-readonly_key: ceiec2018
-
-#clickhouse 管理key
-root_key: ceiec2019
-
-
-
-#-------druid---------#
-#druid 版本
-druid_version: apache-druid-0.18.1
-
-#druid 集群数量限制
-cluster_limit: "4"
-
-
-
-#------Spark---------#
-spark_version: spark-2.2.3-bin-hadoop2.7
-
-scala_version: scala-2.11.7
-
-#请勿修改此配置，安装过程会自动安装此版本scala。
-scala_home: /usr/lib/scala/scala-2.11.7
-
-
-
-
-#-----arangodb---------#
-#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
-arangodb_password: ceiec2018
-
-#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
-arangodb_image_tar_name: arangodb-3.6.4.tar
-
-##########################公共属性#############################
-#设置容器的hostname
-#container_hostname: bifang-api
-#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
-arangodb_image_name: arangodb
-#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
-arangodb_image_tag_name: 3.6.4
-#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
-arangodb_image_container_name: arangodb
-
-#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
-arangodb_soft_home_path: galaxy/workspace/arangodb
-
-#挂载目录的相对路径，不要随意修改
-arango_volume_path: galaxy/volumes/arangodb
-
-
-
-
-#------environment---------#
-#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
-jdk_home_path: /usr/lib/jvm
-
-#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
-#执行脚本的目录
-test_soft_home_path: /home/test/check_begin
-
-
-
-#--------galaxy-chproxy---------#
-#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
-#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
-chproxy_image_tar_name: chproxy-21.06.30.tar
-
-##########################公共属性#############################
-#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
-chproxy_image_name: galaxy-chproxy
-
-#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
-chproxy_image_tag_name: 21.06.30
-
-#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
-chproxy_image_container_name: galaxy-chproxy
-
-#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
-chproxy_soft_home_path: galaxy/workspace/galaxy-chproxy
-
-#挂载目录的相对路径，不要随意修改
-chproxy_volume_path: galaxy/volumes/galaxy-chproxy
-
-
-
-
-
-#-------galaxy-gateway-nginx---------#
-gateway_image_tar_name: nginx-metrics-1.17.0.tar
-
-#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
-gateway_image_name: galaxy-gateway-nginx
-
-##{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
-gateway_image_tag_name: 1.17.0
-
-##{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
-gateway_image_container_name: galaxy-gateway-nginx
-
-#宿主机存放与nginx容器映射的data目录和log的文件夹
-gateway_nginx_soft_home_path: galaxy/workspace/galaxy-gateway-nginx #注意路径最后面没有/
-
-#nginx 数据目录
-gateway_nginx_volume_path: galaxy/volumes/galaxy-gateway-nginx
-
-
-
-
-#--------galaxy-gohangout---------#
-#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
-
-#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
-gohangout_image_tar_name: gohangout-1.15.2.20210408.tar
-
-##########################公共属性#############################
-#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
-gohangout_image_name: gohangout
-#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
-gohangout_image_tag_name: 1.15.2.20210408
-#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
-gohangout_image_container_name: gohangout
-#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
-gohangout_soft_home_path: galaxy/workspace/gohangout
-
-#挂载容器目录的相对路径，不要随意更改
-gohangout_volume_path: galaxy/volumes/gohangout
-
-
-
-#--------galaxy-hos-nginx---------#
-hos_nginx_image_tar_name: nginx-metrics-1.17.0.tar
-
-#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
-hos_nginx_image_name: galaxy-hos-nginx
-
-##{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
-hos_nginx_image_tag_name: 1.17.0
-
-##{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
-hos_nginx_image_container_name: galaxy-hos-nginx
-
-#宿主机存放与nginx容器映射的data目录和log的文件夹
-hos_nginx_soft_home_path: galaxy/workspace/galaxy-hos-nginx #注意路径最后面没有/
-
-#nginx 数据目录
-hos_nginx_volume_path: galaxy/volumes/galaxy-hos-nginx
-
-
-
-#---------galaxy-hos-service---------#
-#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
-hos_service_image_tar_name: galaxy-hos-service-21.07.01.tar
-
-##########################公共属性#############################
-#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
-hos_service_image_name: galaxy-hos-service
-
-#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
-hos_service_image_tag_name: 21.07.01
-
-#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
-hos_service_image_container_name: galaxy-hos-service
-
-#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
-hos_service_soft_home_path: galaxy/workspace/galaxy-hos-service
-
-#挂载目录的相对路径，不要随意修改
-hos_volume_path: galaxy/volumes/galaxy-hos-service
-
-
-
-#---------galaxy-job-service.yml---------#
-#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
-job_image_tar_name: galaxy-job-executor-v1.3.210413-rc1.tar
-admin_image_tar_name: galaxy-job-admin-v1.3.20210408.tar
-
-##########################公共属性#############################
-#设置容器的hostname
-#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
-job_image_name: galaxy-job-executor
-admin_image_name: galaxy-job-admin
-
-#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
-job_image_tag_name: v1.3.210413-rc1
-admin_image_tag_name: v1.3.20210408
-
-#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
-job_image_container_name: galaxy-job-executor
-admin_image_container_name: galaxy-job-admin
-
-#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
-job_soft_home_path: galaxy/workspace/galaxy-job/galaxy-job-executor
-admin_soft_home_path: galaxy/workspace/galaxy-job/galaxy-job-admin
-
-#挂载目录的相对路径，不要随意修改
-job_volume_path: galaxy/volumes/galaxy-job/galaxy-job-executor
-admin_volume_path: galaxy/volumes/galaxy-job/galaxy-job-admin
-
-
-
-
-
-#---------galaxy-qgw-service---------#
-#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
-
-#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
-qgw_image_tar_name: galaxy-qgw-service-345.tar
-
-##########################公共属性#############################
-#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
-qgw_image_name: galaxy-qgw-service
-
-#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
-qgw_image_tag_name: 345
-
-#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
-qgw_image_container_name: galaxy-qgw-service
-
-#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
-qgw_soft_home_path: galaxy/workspace/galaxy-qgw-service
-
-#挂载目录的相对路径，不要随意修改
-qgw_volume_path: galaxy/volumes/galaxy-qgw-service
-
-
-
-
-#---------galaxy-report-service---------#
-#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
-#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
-report_image_tar_name: galaxy-report-service-21.04.07.tar
-
-##########################公共属性#############################
-#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
-report_image_name: galaxy-report-service
-
-#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
-report_image_tag_name: 21.04.07
-
-#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
-report_image_container_name: galaxy-report-service
-
-#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
-report_soft_home_path: galaxy/workspace/galaxy-report-service
-
-#report 数据目录
-report_volume_path: galaxy/volumes/galaxy-report-service
diff --git a/inventories/pro/hosts b/inventories/pro/hosts
index 617f06e..93a3060 100644
--- a/inventories/pro/hosts
+++ b/inventories/pro/hosts
@@ -1,49 +1,86 @@
 #此标签指定的IP用于：chproxy、galaxy-app-nginx、galaxy-job-service、galaxy-qgw-service、galaxy-report-service、galaxy-app-keepalive的安装
 #最少需要指定两台。
 [services]
+192.168.45.42
+192.168.45.43
 
 #此标签指定的IP用于：galaxy-hos-service 的安装
 [hos]
+192.168.45.40
+192.168.45.41
 
 #此标签指定的IP用于：galaxy-hos-keepalive和galaxy-hos-nginx的安装
-#config.yml内的hos_keepalive_need配置是no，则此处不写任何IP，yes就写部署galaxy-hos-service服务keepalive的服务器地址。
+#inventories/pro/group_vars/all内的hos_keepalive_need配置是no，则此处不写任何IP，yes就写部署galaxy-hos-service服务keepalive的服务器地址。
 #不能与services指定的IP相同,且最多为两台。
 [hoskeepalive]
+192.168.45.40
+192.168.45.41
 
 #此标签指定的IP用于：ArangoDB的安装
 [arangodb]
+192.168.45.42
 
 #此标签指定的IP用于：Mariadb的安装，目前版本下仅可配置两个IP，且需要与services标签的前两个IP相同。
 #现没有负载需求，保留后期做负载的功能需求。
 [mariadb]
+192.168.45.42
+192.168.45.43
 
 #此标签指定的IP用于：Nacos的安装
 [nacos]
+192.168.45.37
+192.168.45.38
+192.168.45.39
 
 #此标签指定的IP用于：Apache Zookeeper的安装
 [zookeeper]
+192.168.45.37
+192.168.45.38
+192.168.45.39
 
 #此标签指定的IP用于：Apache Kafka的安装，集群第一台同时部署Kafka-Manager服务。
 [kafka]
+192.168.45.37
+192.168.45.38
+192.168.45.39
 
 #此标签指定的IP用于：Apache Storm的安装，根据内部约定，若集群整体小于3台则第一台为numbus节点；大于三台则前三台为nimbus节点。
 [storm]
+192.168.45.37
+192.168.45.38
+192.168.45.39
 
 #此标签指定的IP用于：Apache Hadoop的安装
 [hadoop]
+192.168.45.37
+192.168.45.38
+192.168.45.39
 
 #此标签指定的IP用于：Apache HBase的安装
 [hbase]
+192.168.45.37
+192.168.45.38
+192.168.45.39
 
 #此标签指定的IP用于：Apache Spark的安装，根据内部约定，若集群小于3台则worker在所有节点上；大于3台则第一个节点为master节点。
 [spark]
+192.168.45.37
+192.168.45.38
+192.168.45.39
 
 #此标签指定的IP用于：Galaxy-Gohangout的安装
 [gohangout]
+192.168.45.40
 
 #此标签指定的IP用于：Apache Druid的安装，根据内部约定，若集群整体小于4台则每台为全部节点；大于4台则前两台默认为query节点。
 [druid]
+192.168.45.37
+192.168.45.38
+192.168.45.39
 
 #此标签指定的IP用于：Clickhouse的安装,根据内部约定，前两台默认为query节点。
 [clickhouse]
-
+192.168.45.40
+192.168.45.41
+192.168.45.42
+192.168.45.43
diff --git a/parcels/roles/check/check-services/tasks/main.yml b/parcels/roles/check/check-services/tasks/main.yml
index 95fa5ce..58261f2 100644
--- a/parcels/roles/check/check-services/tasks/main.yml
+++ b/parcels/roles/check/check-services/tasks/main.yml
@@ -56,7 +56,7 @@
   register: check_out
   run_once: true
   delegate_facts: true
-  delegate_to: '{{ groups.gohangout[1] }}'
+  delegate_to: '{{ groups.gohangout[0] }}'
 
 - fail:
     msg: "{{ inventory_hostname }}- gohangout start job num is not all. Please check it"
diff --git a/parcels/roles/components/arangodb/vars/main.yml b/parcels/roles/components/arangodb/vars/main.yml
index e69de29..a0d83bc 100644
--- a/parcels/roles/components/arangodb/vars/main.yml
+++ b/parcels/roles/components/arangodb/vars/main.yml
@@ -0,0 +1,21 @@
+#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
+arangodb_password: ceiec2018
+
+#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
+arangodb_image_tar_name: arangodb-3.6.4.tar
+
+##########################公共属性#############################
+#设置容器的hostname
+#container_hostname: bifang-api
+#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
+arangodb_image_name: arangodb
+#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
+arangodb_image_tag_name: 3.6.4
+#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
+arangodb_image_container_name: arangodb
+
+#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
+arangodb_soft_home_path: galaxy/workspace/arangodb
+
+#挂载目录的相对路径，不要随意修改
+arango_volume_path: galaxy/volumes/arangodb
diff --git a/parcels/roles/components/clickhouse/common/vars/main.yml b/parcels/roles/components/clickhouse/common/vars/main.yml
index e69de29..d9cd341 100644
--- a/parcels/roles/components/clickhouse/common/vars/main.yml
+++ b/parcels/roles/components/clickhouse/common/vars/main.yml
@@ -0,0 +1,11 @@
+#clickhouse 版本
+clickhouse_version: 20.3.12.112
+
+#clickhouse默认的数据库
+default_database: default
+
+#clickhouse 只读key
+readonly_key: ceiec2018
+
+#clickhouse 管理key
+root_key: ceiec2019
diff --git a/parcels/roles/components/clickhouse/data/vars/main.yml b/parcels/roles/components/clickhouse/data/vars/main.yml
index e69de29..d9cd341 100644
--- a/parcels/roles/components/clickhouse/data/vars/main.yml
+++ b/parcels/roles/components/clickhouse/data/vars/main.yml
@@ -0,0 +1,11 @@
+#clickhouse 版本
+clickhouse_version: 20.3.12.112
+
+#clickhouse默认的数据库
+default_database: default
+
+#clickhouse 只读key
+readonly_key: ceiec2018
+
+#clickhouse 管理key
+root_key: ceiec2019
diff --git a/parcels/roles/components/clickhouse/query/vars/main.yml b/parcels/roles/components/clickhouse/query/vars/main.yml
index e69de29..d9cd341 100644
--- a/parcels/roles/components/clickhouse/query/vars/main.yml
+++ b/parcels/roles/components/clickhouse/query/vars/main.yml
@@ -0,0 +1,11 @@
+#clickhouse 版本
+clickhouse_version: 20.3.12.112
+
+#clickhouse默认的数据库
+default_database: default
+
+#clickhouse 只读key
+readonly_key: ceiec2018
+
+#clickhouse 管理key
+root_key: ceiec2019
diff --git a/parcels/roles/components/druid/tasks/install_druid.yml b/parcels/roles/components/druid/tasks/install_druid.yml
index f3cd61e..8a2900a 100644
--- a/parcels/roles/components/druid/tasks/install_druid.yml
+++ b/parcels/roles/components/druid/tasks/install_druid.yml
@@ -145,7 +145,7 @@
 #解压tar
 - name: unpack {{ druid_version }}.tar.gz
   unarchive: 
-    src: '{{ druid_version }}.tar.gz'
+    src: '{{ package_path }}/{{ druid_version }}.tar.gz'
     dest: '{{ install_path }}/'
 
 #拷贝druid 配置文件
diff --git a/parcels/roles/components/druid/vars/main.yml b/parcels/roles/components/druid/vars/main.yml
index e69de29..054d419 100644
--- a/parcels/roles/components/druid/vars/main.yml
+++ b/parcels/roles/components/druid/vars/main.yml
@@ -0,0 +1,5 @@
+#druid 版本
+druid_version: apache-druid-0.18.1
+
+#druid 集群数量限制
+cluster_limit: "4"
diff --git a/parcels/roles/components/hadoop/tasks/install_hadoop.yml b/parcels/roles/components/hadoop/tasks/install_hadoop.yml
index 1f296f3..0f74b80 100644
--- a/parcels/roles/components/hadoop/tasks/install_hadoop.yml
+++ b/parcels/roles/components/hadoop/tasks/install_hadoop.yml
@@ -88,7 +88,7 @@
 #解压tar
 - name: unpack hadoop-2.7.1.tar.gz
   unarchive: 
-    src: 'hadoop-2.7.1.tar.gz'
+    src: '{{ package_path }}/hadoop-2.7.1.tar.gz'
     dest: '{{ install_path }}/'
 
 #获取slaves列表
diff --git a/parcels/roles/components/hadoop/vars/main.yml b/parcels/roles/components/hadoop/vars/main.yml
index e69de29..1e36468 100644
--- a/parcels/roles/components/hadoop/vars/main.yml
+++ b/parcels/roles/components/hadoop/vars/main.yml
@@ -0,0 +1,2 @@
+hadoop_version: hadoop-2.7.1
+
diff --git a/parcels/roles/components/hbase/tasks/install_hbase.yml b/parcels/roles/components/hbase/tasks/install_hbase.yml
index 287b585..6c9a18f 100644
--- a/parcels/roles/components/hbase/tasks/install_hbase.yml
+++ b/parcels/roles/components/hbase/tasks/install_hbase.yml
@@ -106,7 +106,7 @@
 #解压tar
 - name: unpack {{ hbase_version }}.tar.gz
   unarchive: 
-    src: '{{ hbase_version }}.tar.gz'
+    src: '{{ package_path }}/{{ hbase_version }}.tar.gz'
     dest: '{{ install_path }}/'	
 
 #获取 regionservers 列表
diff --git a/parcels/roles/components/hbase/vars/main.yml b/parcels/roles/components/hbase/vars/main.yml
index e69de29..1f0eb00 100644
--- a/parcels/roles/components/hbase/vars/main.yml
+++ b/parcels/roles/components/hbase/vars/main.yml
@@ -0,0 +1,2 @@
+hbase_version: hbase-2.2.3
+
diff --git a/parcels/roles/components/kafka/tasks/install_kafka.yml b/parcels/roles/components/kafka/tasks/install_kafka.yml
index 07e97d9..64a3815 100644
--- a/parcels/roles/components/kafka/tasks/install_kafka.yml
+++ b/parcels/roles/components/kafka/tasks/install_kafka.yml
@@ -91,7 +91,7 @@
 #解压tar
 - name: unpack {{ kafka_version }}.tgz
   unarchive: 
-    src: '{{ kafka_version }}.tgz'
+    src: '{{ package_path }}/{{ kafka_version }}.tgz'
     dest: '{{ install_path }}/'
 
 #复制tar到目标服务器
@@ -106,7 +106,7 @@
 #解压tar
 - name: unpack {{ kafka_manager_version }}.zip
   unarchive:
-    src: '{{ kafka_manager_version }}.zip'
+    src: '{{ package_path }}/{{ kafka_manager_version }}.zip'
     dest: '{{ install_path }}/'
   run_once: true
   delegate_to: "{{ manager_ip }}"
diff --git a/parcels/roles/components/kafka/vars/main.yml b/parcels/roles/components/kafka/vars/main.yml
index e69de29..ea5f776 100644
--- a/parcels/roles/components/kafka/vars/main.yml
+++ b/parcels/roles/components/kafka/vars/main.yml
@@ -0,0 +1,11 @@
+#Kafka版本
+kafka_version: kafka_2.11-1.0.0
+
+#kafka-manager 版本
+kafka_manager_version: kafka-manager-1.3.3.18
+
+#kafka broker起始id
+kafka_start_broker: 1
+
+#kafka default port
+server_port: 9092
diff --git a/parcels/roles/components/mariadb/install-mariadb-cluster/file/slow_query.log b/parcels/roles/components/mariadb/install-mariadb-cluster/files/slow_query.log
similarity index 100%
rename from parcels/roles/components/mariadb/install-mariadb-cluster/file/slow_query.log
rename to parcels/roles/components/mariadb/install-mariadb-cluster/files/slow_query.log
diff --git a/parcels/roles/components/mariadb/install-mariadb-cluster/tasks/install-mariadb.yml b/parcels/roles/components/mariadb/install-mariadb-cluster/tasks/install-mariadb.yml
index c861cf6..a93a732 100644
--- a/parcels/roles/components/mariadb/install-mariadb-cluster/tasks/install-mariadb.yml
+++ b/parcels/roles/components/mariadb/install-mariadb-cluster/tasks/install-mariadb.yml
@@ -9,7 +9,7 @@
         force: true
         mode: 0755
       when: check_out.stdout >= '1'
-    - name: unload kafka
+    - name: unload mariadb
       shell: cd {{ install_path }} && sh unload_mariadb.sh
       when: check_out.stdout >= '1'
     - name: Ansible delete {{ install_path }}/unload_mariadb.sh
diff --git a/parcels/roles/components/mariadb/install-mariadb-cluster/vars/main.yml b/parcels/roles/components/mariadb/install-mariadb-cluster/vars/main.yml
index e69de29..498cbf1 100644
--- a/parcels/roles/components/mariadb/install-mariadb-cluster/vars/main.yml
+++ b/parcels/roles/components/mariadb/install-mariadb-cluster/vars/main.yml
@@ -0,0 +1,2 @@
+#mariadb数据目录
+mariadb_datadir_path: /data/mariadb
diff --git a/parcels/roles/components/nacos/tasks/install_nacos.yml b/parcels/roles/components/nacos/tasks/install_nacos.yml
index feb4e2e..8f7e334 100644
--- a/parcels/roles/components/nacos/tasks/install_nacos.yml
+++ b/parcels/roles/components/nacos/tasks/install_nacos.yml
@@ -77,7 +77,7 @@
 #解压tar
 - name: unpack {{ nacos_version }}.tar
   unarchive: 
-    src: '{{ nacos_version }}.tar.gz'
+    src: '{{ package_path }}/{{ nacos_version }}.tar.gz'
     dest: '{{ install_path }}/'
 #拷贝配置文件
 - name: copy application.properties
diff --git a/parcels/roles/components/nacos/templates/application.properties.j2 b/parcels/roles/components/nacos/templates/application.properties.j2
index e161a75..5db69b2 100644
--- a/parcels/roles/components/nacos/templates/application.properties.j2
+++ b/parcels/roles/components/nacos/templates/application.properties.j2
@@ -30,10 +30,10 @@ server.port={{ nacos_port }}
 
 #*************** Config Module Related Configurations ***************#
 ### If use MySQL as datasource:
-# spring.datasource.platform=mysql
+spring.datasource.platform=mysql
 
 ### Count of DB:
-# db.num=1
+db.num=1
 
 ### Connect URL of DB:
 db.url.0=jdbc:mysql://{{ gateway_keepalive_host }}:{{ galaxy_mariadb_port }}/{{ mariadb_nacos_database }}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
diff --git a/parcels/roles/components/nacos/vars/main.yml b/parcels/roles/components/nacos/vars/main.yml
index e69de29..42d041d 100644
--- a/parcels/roles/components/nacos/vars/main.yml
+++ b/parcels/roles/components/nacos/vars/main.yml
@@ -0,0 +1,5 @@
+#nacos version
+nacos_version: nacos-2.0.2
+
+#nacos local port
+nacos_port: 8847
diff --git a/parcels/roles/components/spark/tasks/install_spark.yml b/parcels/roles/components/spark/tasks/install_spark.yml
index dc3c7cb..9b815d8 100644
--- a/parcels/roles/components/spark/tasks/install_spark.yml
+++ b/parcels/roles/components/spark/tasks/install_spark.yml
@@ -86,13 +86,13 @@
 #解压tar
 - name: unpack {{ spark_version }}.tar.gz
   unarchive: 
-    src: '{{ spark_version }}.tar.gz'
+    src: '{{ package_path }}/{{ spark_version }}.tar.gz'
     dest: '{{ install_path }}/'
     
 #解压tar
 - name: unpack {{ scala_version }}.tar.gz
   unarchive: 
-    src: '{{ scala_version }}.tar.gz'
+    src: '{{ package_path }}/{{ scala_version }}.tar.gz'
     dest: '/usr/lib/scala/'
 
 - name: master_ip to ansible variable
diff --git a/parcels/roles/components/spark/vars/main.yml b/parcels/roles/components/spark/vars/main.yml
index e69de29..5015dbb 100644
--- a/parcels/roles/components/spark/vars/main.yml
+++ b/parcels/roles/components/spark/vars/main.yml
@@ -0,0 +1,6 @@
+spark_version: spark-2.2.3-bin-hadoop2.7
+
+scala_version: scala-2.11.7
+
+#请勿修改此配置，安装过程会自动安装此版本scala。
+scala_home: /usr/lib/scala/scala-2.11.7
diff --git a/parcels/roles/components/storm/tasks/install_storm.yml b/parcels/roles/components/storm/tasks/install_storm.yml
index df3e022..a8511a8 100644
--- a/parcels/roles/components/storm/tasks/install_storm.yml
+++ b/parcels/roles/components/storm/tasks/install_storm.yml
@@ -97,7 +97,7 @@
 
 - name: unpack apache-storm-1.0.2.tar.gz
   unarchive: 
-    src: 'apache-storm-1.0.2.tar.gz'
+    src: '{{ package_path }}/apache-storm-1.0.2.tar.gz'
     dest: '{{ install_path }}/'
 
 - name: copy dae-nimbus.sh to {{ install_path }}/{{ storm_version }}/bin/
diff --git a/parcels/roles/components/storm/vars/main.yml b/parcels/roles/components/storm/vars/main.yml
index e69de29..ada58f0 100644
--- a/parcels/roles/components/storm/vars/main.yml
+++ b/parcels/roles/components/storm/vars/main.yml
@@ -0,0 +1,2 @@
+storm_version: apache-storm-1.0.2
+
diff --git a/parcels/roles/components/test/vars/main.yml b/parcels/roles/components/test/vars/main.yml
index e69de29..38a7cd6 100644
--- a/parcels/roles/components/test/vars/main.yml
+++ b/parcels/roles/components/test/vars/main.yml
@@ -0,0 +1,8 @@
+#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
+zookeeper_version: zookeeper-3.4.10
+
+#zookeeper myid起始id，如不是扩容则此处无需修改；若为扩容，则此处改为原集群节点 myid最大值+1
+zk_start_myid: 1
+
+#zookeeper port
+zookeeper_port: 2181
diff --git a/parcels/roles/components/zookeeper/tasks/install_zk.yml b/parcels/roles/components/zookeeper/tasks/install_zk.yml
index fbd7691..623d16e 100644
--- a/parcels/roles/components/zookeeper/tasks/install_zk.yml
+++ b/parcels/roles/components/zookeeper/tasks/install_zk.yml
@@ -84,7 +84,7 @@
 #解压tar
 - name: unpack {{ install_path }}/{{ zookeeper_version }}.tar.gz
   unarchive: 
-    src: '{{ zookeeper_version }}.tar.gz'
+    src: '{{ package_path }}/{{ zookeeper_version }}.tar.gz'
     dest: '{{ install_path }}/'
 
 #拷贝配置文件
diff --git a/parcels/roles/components/zookeeper/vars/main.yml b/parcels/roles/components/zookeeper/vars/main.yml
index e69de29..cf26101 100644
--- a/parcels/roles/components/zookeeper/vars/main.yml
+++ b/parcels/roles/components/zookeeper/vars/main.yml
@@ -0,0 +1,7 @@
+zookeeper_version: zookeeper-3.4.10
+
+#zookeeper myid起始id，如不是扩容则此处无需修改；若为扩容，则此处改为原集群节点 myid最大值+1
+zk_start_myid: 1
+
+#zookeeper port
+zookeeper_port: 2181
diff --git a/parcels/roles/dependencies/check-env/vars/main.yml b/parcels/roles/dependencies/check-env/vars/main.yml
index e69de29..b2276e9 100644
--- a/parcels/roles/dependencies/check-env/vars/main.yml
+++ b/parcels/roles/dependencies/check-env/vars/main.yml
@@ -0,0 +1,3 @@
+#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
+#执行脚本的目录
+test_soft_home_path: /home/test/check_begin
diff --git a/parcels/roles/dependencies/install-jdk/vars/main.yml b/parcels/roles/dependencies/install-jdk/vars/main.yml
index e69de29..ae69d04 100644
--- a/parcels/roles/dependencies/install-jdk/vars/main.yml
+++ b/parcels/roles/dependencies/install-jdk/vars/main.yml
@@ -0,0 +1,3 @@
+#------environment---------#
+#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
+jdk_home_path: /usr/lib/jvm
diff --git a/parcels/roles/init/clickhouse/tasks/init_clickhouse.yml b/parcels/roles/init/clickhouse/tasks/init_clickhouse.yml
index b50e13e..05a29f5 100644
--- a/parcels/roles/init/clickhouse/tasks/init_clickhouse.yml
+++ b/parcels/roles/init/clickhouse/tasks/init_clickhouse.yml
@@ -3,8 +3,8 @@
 
 #复制脚本到目标服务器
 - name: copy create_ck_table.sql
-  copy:
-    src: '../files/create_ck_table.sql'
+  template:
+    src: 'create_ck_table.sql'
     dest: '{{ install_path }}/'
     force: true
     backup: yes
diff --git a/parcels/roles/init/clickhouse/files/create_ck_table.sql b/parcels/roles/init/clickhouse/templates/create_ck_table.sql
similarity index 99%
rename from parcels/roles/init/clickhouse/files/create_ck_table.sql
rename to parcels/roles/init/clickhouse/templates/create_ck_table.sql
index 43c1c39..b6259fb 100644
--- a/parcels/roles/init/clickhouse/files/create_ck_table.sql
+++ b/parcels/roles/init/clickhouse/templates/create_ck_table.sql
@@ -4082,10 +4082,12 @@ ENGINE =Distributed(ck_cluster,tsg_galaxy_v3,active_defence_event_log_local,rand
 
 
 
-CREATE DICTIONARY IF NOT EXISTS cdn on cluster ck_cluster (
+DROP DICTIONARY IF EXISTS tsg_galaxy_v3.cdn on cluster ck_cluster;
+
+CREATE DICTIONARY IF NOT EXISTS tsg_galaxy_v3.cdn on cluster ck_cluster (
 cdn_id UInt64,
  domain String,
- cname String) PRIMARY KEY cdn_id SOURCE(MYSQL(PORT 3306 USER 'root' PASSWORD 'bifang!@#' REPLICA (HOST '192.168.44.71' PRIORITY 1) DB 'tsg-bifang' TABLE 'tsg_cdn_domain_info')) LIFETIME(MIN 300 MAX 400) LAYOUT(FLAT());
+ cname String) PRIMARY KEY cdn_id SOURCE(MYSQL(PORT {{ bifang_mariadb_port }} USER 'root' PASSWORD '{{ bifang_mariadb_pin }}' REPLICA (HOST '{{ bifang_mariadb_host }}' PRIORITY 1) DB 'tsg-bifang' TABLE 'tsg_cdn_domain_info')) LIFETIME(MIN 300 MAX 400) LAYOUT(FLAT());
 
  create table IF NOT EXISTS tsg_galaxy_v3.cdn_dic on cluster ck_cluster (`cdn_id` UInt64,
  `domain` String,
diff --git a/parcels/roles/init/clickhouse/files/create_ck_table.sql_21.06 b/parcels/roles/init/clickhouse/templates/create_ck_table.sql_21.06
similarity index 100%
rename from parcels/roles/init/clickhouse/files/create_ck_table.sql_21.06
rename to parcels/roles/init/clickhouse/templates/create_ck_table.sql_21.06
diff --git a/parcels/roles/init/clickhouse/files/dll.sql b/parcels/roles/init/clickhouse/templates/dll.sql
similarity index 100%
rename from parcels/roles/init/clickhouse/files/dll.sql
rename to parcels/roles/init/clickhouse/templates/dll.sql
diff --git a/parcels/roles/init/galaxy-gateway-keepalive/templates/check_gateway.sh.j2 b/parcels/roles/init/galaxy-gateway-keepalive/templates/check_gateway.sh.j2
index b8755e0..0837be0 100644
--- a/parcels/roles/init/galaxy-gateway-keepalive/templates/check_gateway.sh.j2
+++ b/parcels/roles/init/galaxy-gateway-keepalive/templates/check_gateway.sh.j2
@@ -6,8 +6,8 @@ QGW_COUNT=$(ps -ef | grep galaxy-qgw-service | grep -v grep | wc -l)
 if [ $QGW_COUNT -eq 0 ]
 then
   #如果挂掉了，就启动
-  cd {{ install_path }}/{{ soft_home_path }}/galaxy-qgw-service && docker-compose down
-  cd {{ install_path }}/{{ soft_home_path }}/galaxy-qgw-service && docker-compose up -d
+  cd {{ install_path }}/{{ qgw_soft_home_path }}/galaxy-qgw-service && docker-compose down
+  cd {{ install_path }}/{{ qgw_soft_home_path }}/galaxy-qgw-service && docker-compose up -d
   #等5秒钟后，再次查看是否 启动成功
   sleep 5
   #如果没有启动起来，就直接干掉keepalived
@@ -26,8 +26,8 @@ CHPROXY_COUNT=$(ps -ef | grep chproxy | grep -v grep | wc -l)
 if [ $CHPROXY_COUNT -eq 0 ]
 then
   #如果挂掉了，就启动
-  cd {{ install_path }}/{{ soft_home_path }}/galaxy-chproxy && docker-compose down
-  cd {{ install_path }}/{{ soft_home_path }}/galaxy-chproxy && docker-compose up -d
+  cd {{ install_path }}/{{ chproxy_soft_home_path }}/galaxy-chproxy && docker-compose down
+  cd {{ install_path }}/{{ chproxy_soft_home_path }}/galaxy-chproxy && docker-compose up -d
   #等5秒钟后，再次查看是否 启动成功
   sleep 5
   #如果没有启动起来，就直接干掉keepalived
@@ -46,8 +46,8 @@ NGINX_COUNT=$(ps -ef | grep nginx | grep -v grep | wc -l)
 if [ $NGINX_COUNT -eq 0 ]
 then
   #如果挂掉了，就启动
-  cd {{ install_path }}/{{ soft_home_path }}/galaxy-app-nginx && docker-compose down
-  cd {{ install_path }}/{{ soft_home_path }}/galaxy-app-nginx && docker-compose up -d
+  cd {{ install_path }}/{{ gateway_nginx_soft_home_path }}/galaxy-gateway-nginx && docker-compose down
+  cd {{ install_path }}/{{ gateway_nginx_soft_home_path }}/galaxy-gateway-nginx && docker-compose up -d
   #等5秒钟后，再次查看是否 启动成功
   sleep 5
   #如果没有启动起来，就直接干掉keepalived
diff --git a/parcels/roles/init/galaxy-gateway-keepalive/vars/main.yml b/parcels/roles/init/galaxy-gateway-keepalive/vars/main.yml
index e69de29..ec3ca37 100644
--- a/parcels/roles/init/galaxy-gateway-keepalive/vars/main.yml
+++ b/parcels/roles/init/galaxy-gateway-keepalive/vars/main.yml
@@ -0,0 +1,4 @@
+#galaxy-keepalive的相关路径(目前gateway和hos用的是一样的配置)
+keepalived_package_path: /home/keepalive
+
+keepalived_soft_home_path: galaxy/workspace/
diff --git a/parcels/roles/services/galaxy-chproxy/vars/main.yml b/parcels/roles/services/galaxy-chproxy/vars/main.yml
index e69de29..25d6eb6 100644
--- a/parcels/roles/services/galaxy-chproxy/vars/main.yml
+++ b/parcels/roles/services/galaxy-chproxy/vars/main.yml
@@ -0,0 +1,19 @@
+#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
+#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
+chproxy_image_tar_name: chproxy-21.06.30.tar
+
+##########################公共属性#############################
+#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
+chproxy_image_name: chproxy
+
+#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
+chproxy_image_tag_name: 21.06.30
+
+#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
+chproxy_image_container_name: galaxy-chproxy
+
+#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
+chproxy_soft_home_path: galaxy/workspace/galaxy-chproxy
+
+#挂载目录的相对路径，不要随意修改
+chproxy_volume_path: galaxy/volumes/galaxy-chproxy
diff --git a/parcels/roles/services/galaxy-gateway-keepalive/vars/main.yml b/parcels/roles/services/galaxy-gateway-keepalive/vars/main.yml
index e69de29..ec3ca37 100644
--- a/parcels/roles/services/galaxy-gateway-keepalive/vars/main.yml
+++ b/parcels/roles/services/galaxy-gateway-keepalive/vars/main.yml
@@ -0,0 +1,4 @@
+#galaxy-keepalive的相关路径(目前gateway和hos用的是一样的配置)
+keepalived_package_path: /home/keepalive
+
+keepalived_soft_home_path: galaxy/workspace/
diff --git a/parcels/roles/services/galaxy-gateway-nginx/vars/main.yml b/parcels/roles/services/galaxy-gateway-nginx/vars/main.yml
index e69de29..320c8a9 100644
--- a/parcels/roles/services/galaxy-gateway-nginx/vars/main.yml
+++ b/parcels/roles/services/galaxy-gateway-nginx/vars/main.yml
@@ -0,0 +1,17 @@
+gateway_image_tar_name: nginx-metrics-1.17.0.tar
+
+#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
+#gateway_image_name: galaxy-gateway-nginx
+gateway_image_name: nginx-metrics
+
+##{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
+gateway_image_tag_name: 1.17.0
+
+##{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
+gateway_image_container_name: galaxy-gateway-nginx
+
+#宿主机存放与nginx容器映射的data目录和log的文件夹
+gateway_nginx_soft_home_path: galaxy/workspace/galaxy-gateway-nginx #注意路径最后面没有/
+
+#nginx 数据目录
+gateway_nginx_volume_path: galaxy/volumes/galaxy-gateway-nginx
diff --git a/parcels/roles/services/galaxy-gohangout/vars/main.yml b/parcels/roles/services/galaxy-gohangout/vars/main.yml
index e69de29..1c834b4 100644
--- a/parcels/roles/services/galaxy-gohangout/vars/main.yml
+++ b/parcels/roles/services/galaxy-gohangout/vars/main.yml
@@ -0,0 +1,17 @@
+#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
+
+#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
+gohangout_image_tar_name: gohangout-1.15.2.20210408.tar
+
+##########################公共属性#############################
+#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
+gohangout_image_name: gohangout
+#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
+gohangout_image_tag_name: 1.15.2.20210408
+#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
+gohangout_image_container_name: gohangout
+#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
+gohangout_soft_home_path: galaxy/workspace/gohangout
+
+#挂载容器目录的相对路径，不要随意更改
+gohangout_volume_path: galaxy/volumes/gohangout
diff --git a/parcels/roles/services/galaxy-hos-keepalive/vars/main.yml b/parcels/roles/services/galaxy-hos-keepalive/vars/main.yml
index e69de29..ec3ca37 100644
--- a/parcels/roles/services/galaxy-hos-keepalive/vars/main.yml
+++ b/parcels/roles/services/galaxy-hos-keepalive/vars/main.yml
@@ -0,0 +1,4 @@
+#galaxy-keepalive的相关路径(目前gateway和hos用的是一样的配置)
+keepalived_package_path: /home/keepalive
+
+keepalived_soft_home_path: galaxy/workspace/
diff --git a/parcels/roles/services/galaxy-hos-nginx/vars/main.yml b/parcels/roles/services/galaxy-hos-nginx/vars/main.yml
index e69de29..8d2f448 100644
--- a/parcels/roles/services/galaxy-hos-nginx/vars/main.yml
+++ b/parcels/roles/services/galaxy-hos-nginx/vars/main.yml
@@ -0,0 +1,17 @@
+hos_nginx_image_tar_name: nginx-metrics-1.17.0.tar
+
+#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
+#hos_nginx_image_name: galaxy-hos-nginx
+hos_nginx_image_name: nginx-metrics
+
+##{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
+hos_nginx_image_tag_name: 1.17.0
+
+##{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
+hos_nginx_image_container_name: galaxy-hos-nginx
+
+#宿主机存放与nginx容器映射的data目录和log的文件夹
+hos_nginx_soft_home_path: galaxy/workspace/galaxy-hos-nginx #注意路径最后面没有/
+
+#nginx 数据目录
+hos_nginx_volume_path: galaxy/volumes/galaxy-hos-nginx
diff --git a/parcels/roles/services/galaxy-hos-service/tasks/load_hos.yml b/parcels/roles/services/galaxy-hos-service/tasks/load_hos.yml
index b067022..cb5aba6 100644
--- a/parcels/roles/services/galaxy-hos-service/tasks/load_hos.yml
+++ b/parcels/roles/services/galaxy-hos-service/tasks/load_hos.yml
@@ -21,46 +21,46 @@
     state: directory
     path: '{{ data_path }}/{{ hos_service_soft_home_path }}'
 
-- name: copy {{ image_tar_name }}
+- name: copy {{ hos_service_image_tar_name }}
   copy:
-    src: '{{ package_path }}/{{ image_tar_name }}'
-    dest: '{{ data_path }}/{{ hos_service_soft_home_path }}/{{ image_tar_name }}'
+    src: '{{ package_path }}/{{ hos_service_image_tar_name }}'
+    dest: '{{ data_path }}/{{ hos_service_soft_home_path }}/{{ hos_service_image_tar_name }}'
     force: true
     backup: yes
 
-- name: load new {{ image_name }} image from {{ image_tar_name }}
+- name: load new {{ hos_service_image_name }} image from {{ hos_service_image_tar_name }}
   docker_image:
-    name: '{{ image_name }}'
-    tag: '{{ image_tag_name }}'
-    load_path: '{{ data_path }}/{{ hos_service_soft_home_path }}/{{ image_tar_name }}'
+    name: '{{ hos_service_image_name }}'
+    tag: '{{ hos_service_image_tag_name }}'
+    load_path: '{{ data_path }}/{{ hos_service_soft_home_path }}/{{ hos_service_image_tar_name }}'
     source: load
     force_tag: yes
     force_source: yes
   async: 300
 
 - name: change the image tag
-  shell: docker tag galaxy-hos-service:{{ image_tag_name }} {{ image_name }}:{{ image_tag_name }}
+  shell: docker tag galaxy-hos-service:{{ hos_service_image_tag_name }} {{ hos_service_image_name }}:{{ hos_service_image_tag_name }}
 
 
-- name: copy  {{ image_name }} docker-compose.yml
+- name: copy  {{ hos_service_image_name }} docker-compose.yml
   template:
     src: docker-compose.yml.j2
     dest: '{{ data_path }}/{{ hos_service_soft_home_path }}/docker-compose.yml'
     backup: yes
 
-- name: copy  {{ image_name }} application.yml.j2
+- name: copy  {{ hos_service_image_name }} application.yml.j2
   template:
     src: application.yml.j2
     dest: '{{ data_path }}/{{ hos_volume_path }}/config/application.yml'
     backup: yes
 
-- name: copy  {{ image_name }} log4j2-dev.xml.j2
+- name: copy  {{ hos_service_image_name }} log4j2-dev.xml.j2
   template:
     src: log4j2-dev.xml.j2
     dest: '{{ data_path }}/{{ hos_volume_path }}/config/log4j2-dev.xml'
     backup: yes
 
-- name: copy  {{ image_name }} galaxy-hos-service.j2
+- name: copy  {{ hos_service_image_name }} galaxy-hos-service.j2
   template:
     src: galaxy-hos-service.j2
     dest: '{{ data_path }}/{{ hos_service_soft_home_path }}/galaxy-hos-service'
diff --git a/parcels/roles/services/galaxy-hos-service/templates/docker-compose.yml.j2 b/parcels/roles/services/galaxy-hos-service/templates/docker-compose.yml.j2
index 729bd71..4d9d16e 100644
--- a/parcels/roles/services/galaxy-hos-service/templates/docker-compose.yml.j2
+++ b/parcels/roles/services/galaxy-hos-service/templates/docker-compose.yml.j2
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   galaxy-hos-service:
-    image: {{ image_name }}:{{ image_tag_name }}
+    image: {{ hos_service_image_name }}:{{ hos_service_image_tag_name }}
     container_name: {{ hos_service_image_container_name }}
     environment:
       JAVA_OPTS: "{{ hos_java_opts }} -Xss256k -XX:MetaspaceSize=128m -XX:MaxPermSize=128m -XX:SurvivorRatio=2 -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:MaxTenuringThreshold=15 -XX:+UseCMSCompactAtFullCollection -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70"
diff --git a/parcels/roles/services/galaxy-hos-service/vars/main.yml b/parcels/roles/services/galaxy-hos-service/vars/main.yml
index e69de29..157c339 100644
--- a/parcels/roles/services/galaxy-hos-service/vars/main.yml
+++ b/parcels/roles/services/galaxy-hos-service/vars/main.yml
@@ -0,0 +1,18 @@
+#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
+hos_service_image_tar_name: galaxy-hos-service-21.07.01.tar
+
+##########################公共属性#############################
+#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
+hos_service_image_name: galaxy-hos-service
+
+#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
+hos_service_image_tag_name: 21.07.01
+
+#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
+hos_service_image_container_name: galaxy-hos-service
+
+#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
+hos_service_soft_home_path: galaxy/workspace/galaxy-hos-service
+
+#挂载目录的相对路径，不要随意修改
+hos_volume_path: galaxy/volumes/galaxy-hos-service
diff --git a/parcels/roles/services/galaxy-job-service/tasks/load_admin.yml b/parcels/roles/services/galaxy-job-service/tasks/load_admin.yml
index d318423..69c748f 100644
--- a/parcels/roles/services/galaxy-job-service/tasks/load_admin.yml
+++ b/parcels/roles/services/galaxy-job-service/tasks/load_admin.yml
@@ -46,7 +46,7 @@
 
 - name: copy {{ admin_image_tar_name }}
   copy:     
-    src: '{{ {{ package_path }} }}/{{ admin_image_tar_name }}'
+    src: '{{ package_path }}/{{ admin_image_tar_name }}'
     dest: '{{ install_path }}/{{ admin_soft_home_path }}/{{ admin_image_tar_name }}'
     force: true
     backup: yes
diff --git a/parcels/roles/services/galaxy-job-service/vars/main.yml b/parcels/roles/services/galaxy-job-service/vars/main.yml
index e69de29..e55c12b 100644
--- a/parcels/roles/services/galaxy-job-service/vars/main.yml
+++ b/parcels/roles/services/galaxy-job-service/vars/main.yml
@@ -0,0 +1,25 @@
+#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
+job_image_tar_name: galaxy-job-executor-v1.3.210413-rc1.tar
+admin_image_tar_name: galaxy-job-admin-v1.3.20210408.tar
+
+##########################公共属性#############################
+#设置容器的hostname
+#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
+job_image_name: galaxy-job-executor
+admin_image_name: galaxy-job-admin
+
+#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
+job_image_tag_name: v1.3.210413-rc1
+admin_image_tag_name: v1.3.20210408
+
+#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
+job_image_container_name: galaxy-job-executor
+admin_image_container_name: galaxy-job-admin
+
+#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
+job_soft_home_path: galaxy/workspace/galaxy-job/galaxy-job-executor
+admin_soft_home_path: galaxy/workspace/galaxy-job/galaxy-job-admin
+
+#挂载目录的相对路径，不要随意修改
+job_volume_path: galaxy/volumes/galaxy-job/galaxy-job-executor
+admin_volume_path: galaxy/volumes/galaxy-job/galaxy-job-admin
diff --git a/parcels/roles/services/galaxy-qgw-service/vars/main.yml b/parcels/roles/services/galaxy-qgw-service/vars/main.yml
index e69de29..ae83df9 100644
--- a/parcels/roles/services/galaxy-qgw-service/vars/main.yml
+++ b/parcels/roles/services/galaxy-qgw-service/vars/main.yml
@@ -0,0 +1,20 @@
+#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
+
+#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
+qgw_image_tar_name: galaxy-qgw-service-345.tar
+
+##########################公共属性#############################
+#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
+qgw_image_name: galaxy-qgw-service
+
+#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
+qgw_image_tag_name: 345
+
+#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
+qgw_image_container_name: galaxy-qgw-service
+
+#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
+qgw_soft_home_path: galaxy/workspace/galaxy-qgw-service
+
+#挂载目录的相对路径，不要随意修改
+qgw_volume_path: galaxy/volumes/galaxy-qgw-service
diff --git a/parcels/roles/services/galaxy-report-service/vars/main.yml b/parcels/roles/services/galaxy-report-service/vars/main.yml
index e69de29..93a1e5f 100644
--- a/parcels/roles/services/galaxy-report-service/vars/main.yml
+++ b/parcels/roles/services/galaxy-report-service/vars/main.yml
@@ -0,0 +1,19 @@
+#注意这里面定义的key中不能包含减号-,否则程序无法识别定义的key
+#离线模式下使用:bifang-api的docker镜像文件名称,在../file中的文件名称
+report_image_tar_name: galaxy-report-service-21.04.07.tar
+
+##########################公共属性#############################
+#{{ image_tar_name }}中的镜像名称,或者{{ docker_registry_image_and_tag }}中的镜像名称,不含版本号
+report_image_name: galaxy-report-service
+
+#{{ image_tar_name }}的镜像版本号,或者{{ docker_registry_image_and_tag }}中的镜像版本号
+report_image_tag_name: 21.04.07
+
+#{{ image_tar_name }}的镜像,或者{{ docker_registry_image_and_tag }}中的镜像启动后的容器名称
+report_image_container_name: galaxy-report-service
+
+#镜像文件,docker-compose文件以及数据卷共享目录所在的位置,注意路径最后面不带/
+report_soft_home_path: galaxy/workspace/galaxy-report-service
+
+#report 数据目录
+report_volume_path: galaxy/volumes/galaxy-report-service