新增sed-upper.sh 修改上层模板 2-replace-file.sh改为模板

script/autodl/2-replace-file.sh

@@ -2,24 +2,24 @@
 #wangtingwei
 #用于autodl服务配置文件渲染
 workspace=/workspace/autodl
-core_nginx=http://106.38.203.204:40099                 #30099
+core_nginx=http://PUBLIC_IP:30099                 #30099
 ################################autodl配置文件##########################
-autodl_backend=http://106.38.203.204:40091 #30091
-autodl_back_socket=ws://106.38.203.204:40091  #如果是域名 https此处需要为wss ，如果是ip 则改成ws
-autodl_file=http://106.38.203.204:40093         #30093
-autodl_admin_backend=http://106.38.203.204:30072  # 30092
+autodl_backend=http://PUBLIC_IP:30091 #30091
+autodl_back_socket=ws://PUBLIC_IP:30091  #如果是域名 https此处需要为wss ，如果是ip 则改成ws
+autodl_file=http://PUBLIC_IP:30093         #30093
+autodl_admin_backend=http://PUBLIC_IP:30092  # 30092
 deploy_is_private=true # true代表私有部署
-autodl_admin_back_socket=ws://106.38.203.204:30072  # 30092
+autodl_admin_back_socket=ws://PUBLIC_IP:30092  # 30092
 ###############其他依赖服务变量信息#########################################
-autodl_es=http://192.168.1.32:9200
-mysql_host=192.168.1.32:3306
+autodl_es=http://INTRANET_IP:9200
+mysql_host=INTRANET_IP:3306
 mysql_user=root
 mysql_password=seetatech
-redis_host=192.168.1.32:6379
+redis_host=INTRANET_IP:6379
 redis_password=seetatech
-mongo_host='mongodb://admin:admin@192.168.1.32:27017/seetaas?authSource=admin'     #&号前记得加转义
-harbor_host=192.168.1.32:5000
-hb_host=192.168.1.32:5000
+mongo_host='mongodb://admin:admin@INTRANET_IP:27017/seetaas?authSource=admin'     #&号前记得加转义
+harbor_host=INTRANET_IP:5000
+hb_host=INTRANET_IP:5000
 ###############################修改后端app.yaml################################
 sudo sed -i s/redis_host/$redis_host/g `find $workspace -type f -name app.yaml`
 sudo sed -i s/mysql_host/$mysql_host/g `find $workspace -type f -name app.yaml`

script/harbor/seetaas-operator-pull-push.sh

@@ -2,19 +2,19 @@
 #王庭威
 # pull参数用于下载更新预处理器镜像以及导出镜像为压缩包、push参数为tag镜像以及推送镜像到私有仓库
 # 如果预处理不需要支持jupter，则除了operator镜像外，其他镜像文件注释。
-harbor_host=192.168.1.56:5000
+harbor_host=192.168.1.32:5000
 harbor_passwd=admin
 image_path=/data/operater-images
 base_url=hb.seetatech.com/k8s
 image_name=(
 operator:0.1.13
-operator-python:0.0.1
-dragon:0.3.0.dev20191121-cuda10.0-ubuntu16.04
-pytorch:cuda9.2-py3-v0.4.1
-pytorch:cuda10.0-py3-v1.2.0
-tensorflow:gpu-py3-v1.14.0
-tensorflow:gpu-py3-v1.5.0
-tensorflow:gpu-py3-v1.8.0
+#operator-python:0.0.1
+#dragon:0.3.0.dev20191121-cuda10.0-ubuntu16.04
+#pytorch:cuda9.2-py3-v0.4.1
+#pytorch:cuda10.0-py3-v1.2.0
+#tensorflow:gpu-py3-v1.14.0
+#tensorflow:gpu-py3-v1.5.0
+#tensorflow:gpu-py3-v1.8.0
 )
 ####################################################
 pull_save() {

script/sed-upper.sh

+#!/bin/bash
+#王庭威
+#用于修改autodl 和 seetaas项目中的2-replace-file.sh中的部署主机ip变量
+#intranet_ip是内网ip，public_ip是公网ip. 私有部署环境下，二者值一样
+PUBLIC_IP=106.38.203.205
+INTRANET_IP=192.168.1.32
+
+function seetaas_sed() {
+sed -i s/PUBLIC_IP/$PUBLIC_IP/g seetaas/2-replace-file.sh
+sed -i s/INTRANET_IP/$INTRANET_IP/g seetaas/2-replace-file.sh
+}
+
+function autodl_sed() {
+sed -i s/PUBLIC_IP/$PUBLIC_IP/g autodl/2-replace-file.sh
+sed -i s/INTRANET_IP/$INTRANET_IP/g autodl/2-replace-file.sh
+}
+case $1 in
+seetaas)
+  seetaas_sed
+  ;;
+autodl)
+  autodl_sed
+  ;;
+*)
+  echo "please input (seetaas|autodl)"
+esac
+
+

script/seetaas/2-replace-file.sh

+#!/bin/bash
+#王庭威
+#用于私有部署修改seetaas业务配置文件模板
 workspace=/workspace/seetaas
 ################seetaas组件变量信息##########################
-seetaas_frontend=http://106.38.203.204:30188         #30180
-seetaas_backend=http://106.38.203.204:30222          #30200
-seetaas_back_socket=ws://106.38.203.204:30222   #  30200 https对应wss
-seetaas_imageproxy=http://106.38.203.204:31202        #30202
-seetaas_deploy=http://106.38.203.204:30301          #30201 
-usercenter_frontend=http://106.38.203.204:30322        #30302
-usercenter_backend=http://106.38.203.204:30330          #30300
-core_nginx=http://106.38.203.204:30999                 #30099
-visit_uc_frontend=106.38.203.204  #user-center前端的主机ip 或域名
-mobile_frontend=http://106.38.203.204:30182                #30181
+seetaas_frontend=http://PUBLIC_IP:30180         #30180
+seetaas_backend=http://PUBLIC_IP:30200         #30200
+seetaas_back_socket=ws://PUBLIC_IP:30200   #  30200 https对应wss
+seetaas_imageproxy=http://PUBLIC_IP:30202        #30202
+seetaas_deploy=http://PUBLIC_IP:30201          #30201 
+usercenter_frontend=http://PUBLIC_IP:30302        #30302
+usercenter_backend=http://PUBLIC_IP:30330          #30300
+core_nginx=http://PUBLIC_IP:30099                 #30099
+visit_uc_frontend=PUBLIC_IP  #user-center前端的主机ip 或域名
+mobile_frontend=http://PUBLIC_IP:30181                #30181
 ###############其他依赖服务变量信息#########################################
-mysql_host=192.168.1.32:3306
+mysql_host=INTRANET_IP:3306
 mysql_user=root
 mysql_password=seetatech
-redis_host=192.168.1.32:6379
+redis_host=INTRANET_IP:6379
 redis_password=seetatech
-mongo_host='mongodb://admin:admin@192.168.1.32:27017/seetaas?authSource=admin'     #&号前记得加转义
-harbor_host=192.168.1.32:5000
-hb_host=192.168.1.32:5000
+mongo_host='mongodb://admin:admin@INTRANET_IP:27017/seetaas?authSource=admin'     #&号前记得加转义
+harbor_host=INTRANET_IP:5000
+hb_host=INTRANET_IP:5000
 ###############################修改后端app.yaml################################
 sudo sed -i s/redis_host/$redis_host/g `find $workspace -type f -name app.yaml`
 sudo sed -i s/mysql_host/$mysql_host/g `find $workspace -type f -name app.yaml`