Merge branch 'master' of gitlab.seetatech.com:tingweiwang/k8s

script/k8s/deploy-gpu-k8s.sh

@@ -6,6 +6,7 @@ port=22
 password=seetatech 
 password=seetatech 
 etcd_ip=192.168.1.32
 etcd_ip=192.168.1.32
 master_ip=192.168.1.32
 master_ip=192.168.1.32
+new_harbor_ip=192.168.1.32
 harbor_host=192.168.1.32:5000
 harbor_host=192.168.1.32:5000
 harbor_passwd=admin   #写死的不能改，harbor配置文件中password写死了，当前只能是admin
 harbor_passwd=admin   #写死的不能改，harbor配置文件中password写死了，当前只能是admin
 harbor_user=admin
 harbor_user=admin
@@ -436,7 +437,7 @@ ansible master -m shell -a "service docker restart"
 ###########################安装harbor私有仓库##############
 ###########################安装harbor私有仓库##############
 echo "解压harbor到/usr/local/目录"
 echo "解压harbor到/usr/local/目录"
 tar -xvzf /root/k8s/package/harbor_aly.tar.gz -C /usr/local/
 tar -xvzf /root/k8s/package/harbor_aly.tar.gz -C /usr/local/
-cd /usr/local/harbor/ && sed -i s/harbor_host/$harbor_host/g harbor.cfg && ./prepare && ./install.sh && echo "harbor安装成功"
+cd /usr/local/harbor/ && sed -i s/new_harbor_ip/$new_harbor_ip/g harbor.yml && ./install.sh && echo "harbor安装成功"
 echo "自动创建harbor项目目录" && sleep 3
 echo "自动创建harbor项目目录" && sleep 3
 for project in ${harbor_project_list[@]}
 for project in ${harbor_project_list[@]}
 do
 do