Commit 4767f281 authored by tywldx's avatar tywldx

修改执行IP获取方式

parent 8c88127a
...@@ -3,9 +3,12 @@ ip_last=$1 ...@@ -3,9 +3,12 @@ ip_last=$1
project_type=$2 project_type=$2
public_ip=$3 public_ip=$3
set timeout 1200 set timeout 1200
ip=192.168.4.$ip_last
pwd_path_0="/home/qa-deploy-utils"
IP_host=`sh $pwd_path_0/get-ip.sh $ip_last`
echo "参数为: echo "参数为:
ip : ${ip} ip : ${IP_host}
project_type : ${project_type} project_type : ${project_type}
public_ip : ${public_ip} public_ip : ${public_ip}
" "
...@@ -14,7 +17,7 @@ sh /home/qa-deploy-utils/qa_shell_script/1_mount_config_files.sh $ip_last ...@@ -14,7 +17,7 @@ sh /home/qa-deploy-utils/qa_shell_script/1_mount_config_files.sh $ip_last
expect -c " expect -c "
set timeout 10 set timeout 10
spawn ssh root@${ip} spawn ssh root@${IP_host}
expect \"]#\" expect \"]#\"
send \"cd /usr/lib/rabbitmq/bin\r\" send \"cd /usr/lib/rabbitmq/bin\r\"
expect \"]#\" expect \"]#\"
......
#!/bin/bash #!/bin/bash
IP_host_first="192.168.4." pwd_path_0="/home/qa-deploy-utils"
pwd_path="/home/qa-deploy-utils/qa_shell_script" pwd_path="/home/qa-deploy-utils/qa_shell_script"
config_server="$pwd_path/config_server" config_server="$pwd_path/config_server"
project_path=`cat $config_server/get_env_ip.sh` project_path=`cat $config_server/get_env_ip.sh`
...@@ -9,13 +9,14 @@ project_path=`cat $config_server/get_env_ip.sh` ...@@ -9,13 +9,14 @@ project_path=`cat $config_server/get_env_ip.sh`
for ip_last_num in $project_path for ip_last_num in $project_path
do do
IP_host=`sh $pwd_path_0/get-ip.sh $ip_last_num`
if [[ "$ip_last_num" == "50" ]]; then if [[ "$ip_last_num" == "50" ]]; then
echo " not in 50 " echo " not in 50 "
else else
echo "------------------IP-${IP_host_first}${ip_last_num}------------------" echo "------------------IP-${IP_host}------------------"
expect -c " expect -c "
set timeout 10 set timeout 10
spawn ssh root@${IP_host_first}${ip_last_num} spawn ssh root@${IP_host}
expect \"]#\" expect \"]#\"
send \"sh /home/qa-deploy-utils/qa_shell_script/$1\r\" send \"sh /home/qa-deploy-utils/qa_shell_script/$1\r\"
set timeout -1 set timeout -1
......
...@@ -4,11 +4,12 @@ project_name=$2 ...@@ -4,11 +4,12 @@ project_name=$2
branch_name=$3 branch_name=$3
project_type=$4 project_type=$4
public_ip=$5 public_ip=$5
pwd_path_0="/home/qa-deploy-utils"
set timeout 1200 set timeout 1200
ip=192.168.4.$ip_last ip_host=`sh $pwd_path_0/get-ip.sh $ip_last`
echo "参数为: echo "参数为:
#init_shell_script: ${init_shell_script} #init_shell_script: ${init_shell_script}
ip : ${ip} ip : ${ip_host}
project_name : ${project_name} project_name : ${project_name}
branch_name : ${branch_name} branch_name : ${branch_name}
project_type : ${project_type} project_type : ${project_type}
...@@ -18,11 +19,11 @@ public_ip : ${public_ip} ...@@ -18,11 +19,11 @@ public_ip : ${public_ip}
if [ -n "$project_name" ] && [ -n "$branch_name" ]; then if [ -n "$project_name" ] && [ -n "$branch_name" ]; then
expect -c " expect -c "
set timeout 10 set timeout 10
spawn ssh root@${ip} spawn ssh root@${ip_host}
expect \"]#\" expect \"]#\"
send \"cd /home/qa-deploy-utils/qa_shell_script\r\" send \"cd /home/qa-deploy-utils/qa_shell_script\r\"
expect \"]#\" expect \"]#\"
send \"sh deploy_project_by_name.sh $project_name $branch_name $public_ip $ip\r\" send \"sh deploy_project_by_name.sh $project_name $branch_name $public_ip ${ip_host}\r\"
set timeout -1 set timeout -1
expect \"]#\" expect \"]#\"
send \"exit\r\" send \"exit\r\"
...@@ -30,11 +31,11 @@ if [ -n "$project_name" ] && [ -n "$branch_name" ]; then ...@@ -30,11 +31,11 @@ if [ -n "$project_name" ] && [ -n "$branch_name" ]; then
else else
expect -c " expect -c "
set timeout 10 set timeout 10
spawn ssh root@${ip} spawn ssh root@${ip_host}
expect \"]#\" expect \"]#\"
send \"cd /home/qa-deploy-utils/qa_shell_script\r\" send \"cd /home/qa-deploy-utils/qa_shell_script\r\"
expect \"]#\" expect \"]#\"
send \"sh deploy_project_by_type.sh $project_type $branch_name $public_ip $ip\r\" send \"sh deploy_project_by_type.sh $project_type $branch_name $public_ip ${ip_host}\r\"
set timeout -1 set timeout -1
expect \"]#\" expect \"]#\"
send \"exit\r\" send \"exit\r\"
......
#!/bin/bash #!/bin/bash
IP_host_first="192.168.4." pwd_path_0="/home/qa-deploy-utils"
pwd_path="/home/qa-deploy-utils/qa_shell_script" pwd_path="/home/qa-deploy-utils/qa_shell_script"
config_server="$pwd_path/config_server" config_server="$pwd_path/config_server"
project_path=`cat $config_server/get_env_ip.sh` project_path=`cat $config_server/get_env_ip.sh`
...@@ -9,9 +9,10 @@ project_path=`cat $config_server/get_env_ip.sh` ...@@ -9,9 +9,10 @@ project_path=`cat $config_server/get_env_ip.sh`
for ip_last_num in $project_path for ip_last_num in $project_path
do do
IP_host=`sh $pwd_path_0/get-ip.sh $ip_last_num`
expect -c " expect -c "
set timeout 10 set timeout 10
spawn ssh root@${IP_host_first}${ip_last_num} spawn ssh root@${IP_host}
expect \"]#\" expect \"]#\"
send \"sh /home/qa-deploy-utils/qa_shell_script/rabbitmq/initial_mq.sh\r\" send \"sh /home/qa-deploy-utils/qa_shell_script/rabbitmq/initial_mq.sh\r\"
set timeout -1 set timeout -1
......
#!/bin/bash #!/bin/bash
#project_path=`cat $config_server/get_env_ip.sh` #project_path=`cat $config_server/get_env_ip.sh`
IP_host_first="192.168.4." pwd_path_0="/home/qa-deploy-utils"
project_name=$1 project_name=$1
target_ip=$2 target_ip=$2
for ip_last_num in $target_ip for ip_last_num in $target_ip
do do
IP_host=`sh $pwd_path_0/get-ip.sh $ip_last_num`
expect -c " expect -c "
set timeout 10 set timeout 10
spawn ssh root@${IP_host_first}${target_ip} spawn ssh root@${IP_host}
expect \"]#\" expect \"]#\"
send \"sh /home/qa-deploy-utils/qa_shell_script/6_start_by_name.sh $project_name\r\" send \"sh /home/qa-deploy-utils/qa_shell_script/6_start_by_name.sh $project_name\r\"
set timeout -1 set timeout -1
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
scriptname=$(basename $0) scriptname=$(basename $0)
lock="/var/run/${scriptname}" lock="/var/run/${scriptname}"
pwd_path_0="/home/qa-deploy-utils"
exec 200>$lock exec 200>$lock
#flock -n 200 || {echo "sub.sh 正在被其他人执行,请稍后再试" && exit 1}
#flock -n 200 || exit 1
flock -n 200 flock -n 200
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
_p=`ps aux | grep $scriptname | grep -v grep | head -n 1 |awk '{print $2}'` _p=`ps aux | grep $scriptname | grep -v grep | head -n 1 |awk '{print $2}'`
...@@ -17,8 +17,7 @@ fi ...@@ -17,8 +17,7 @@ fi
pid=$$ pid=$$
echo $pid 1>&200 echo $pid 1>&200
IP_host_first="192.168.4." public_ip="q-gp.com"
public_ip="q-gp.com" #"139.198.2.95"
pwd_path="/home/qa-deploy-utils/qa_shell_script" pwd_path="/home/qa-deploy-utils/qa_shell_script"
config_server="$pwd_path/config_server" config_server="$pwd_path/config_server"
ips=`cat $config_server/get_env_ip.sh` ips=`cat $config_server/get_env_ip.sh`
...@@ -40,17 +39,18 @@ done ...@@ -40,17 +39,18 @@ done
echo "共要生成$counts个环境的配置文件" echo "共要生成$counts个环境的配置文件"
echo "并发生成3个环境的配置文件,预计执行时间一分钟左右,负载最大时为3~" echo "并发生成3个环境的配置文件,预计执行时间一分钟左右,负载最大时为3~"
#for ip_last_num in '15'
for ip_last_num in ${ips[@]} for ip_last_num in ${ips[@]}
do do
IP_host=`sh $pwd_path_0/get-ip.sh $ip_last_num`
read -u1000 read -u1000
{ {
echo "`date +%T.%N` 开始生成 ${IP_host_first}${ip_last_num}" echo "`date +%T.%N` 开始生成 ${IP_host}"
cd /home/sub_config_file_dont_rm cd /home/sub_config_file_dont_rm
#不能直接RM 整个文件,会造成mount失效 #不能直接RM 整个文件,会造成mount失效
#rm -rf ${IP_host_first}${ip_last_num} mkdir -p ${IP_host}
mkdir -p ${IP_host_first}${ip_last_num} cd ${IP_host}
cd ${IP_host_first}${ip_last_num}
rm -rf java rm -rf java
rm -rf node rm -rf node
rm -rf ui rm -rf ui
...@@ -67,13 +67,11 @@ do ...@@ -67,13 +67,11 @@ do
mkdir -p $dir/public/java mkdir -p $dir/public/java
cp -rf /home/config_files/java/* $dir/java/ cp -rf /home/config_files/java/* $dir/java/
cp -rf /home/config_files/java/* $dir/public/java/ cp -rf /home/config_files/java/* $dir/public/java/
sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/" $dir/java/* sed -i "s/target_host_name/${IP_host}/" $dir/java/*
sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/" $dir/public/java/* sed -i "s/target_host_name/${IP_host}/" $dir/public/java/*
sed -i "s/target_mq_host_name/${IP_host_first}${ip_last_num}/" $dir/java/* sed -i "s/target_mq_host_name/${IP_host}/" $dir/java/*
sed -i "s/target_mq_host_name/${IP_host_first}${ip_last_num}/" $dir/public/java/* sed -i "s/target_mq_host_name/${IP_host}/" $dir/public/java/*
#gu-bei的回调接口都改成外网接口 #gu-bei的回调接口都改成外网接口
#sed -i "s/callback=http:\/\/${IP_host_first}${ip_last_num}:7006/callback=http:\/\/${public_ip}:${ip_last_num}06/g" $dir/java/gu-bei.properties
#sed -i "s/pay_notify_url=http:\/\/${IP_host_first}${ip_last_num}:7006/pay_notify_url=http:\/\/${public_ip}:${ip_last_num}06/g" $dir/java/gu-bei.properties
sed -i "s/ip_last/$ip_last_num/g" $dir/java/* sed -i "s/ip_last/$ip_last_num/g" $dir/java/*
sed -i "s/ip_last/$ip_last_num/g" $dir/public/java/* sed -i "s/ip_last/$ip_last_num/g" $dir/public/java/*
...@@ -81,7 +79,7 @@ do ...@@ -81,7 +79,7 @@ do
#python项目发布 #python项目发布
mkdir -p $dir/python mkdir -p $dir/python
cp -rf /home/config_files/python/* $dir/python/ cp -rf /home/config_files/python/* $dir/python/
sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/" $dir/python/* sed -i "s/target_host_name/${IP_host}/" $dir/python/*
sed -i "s/ip_last/$ip_last_num/g" $dir/python/* sed -i "s/ip_last/$ip_last_num/g" $dir/python/*
#node项目发布 #node项目发布
...@@ -89,8 +87,8 @@ do ...@@ -89,8 +87,8 @@ do
mkdir -p $dir/public/node mkdir -p $dir/public/node
cp -rf /home/config_files/node/* $dir/node/ cp -rf /home/config_files/node/* $dir/node/
cp -rf /home/config_files/node/* $dir/public/node/ cp -rf /home/config_files/node/* $dir/public/node/
sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/" $dir/node/* sed -i "s/target_host_name/${IP_host}/" $dir/node/*
sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/g" $dir/public/node/* sed -i "s/target_host_name/${IP_host}/g" $dir/public/node/*
sed -i "s/ip_last/$ip_last_num/g" $dir/node/* sed -i "s/ip_last/$ip_last_num/g" $dir/node/*
sed -i "s/ip_last/$ip_last_num/g" $dir/public/node/* sed -i "s/ip_last/$ip_last_num/g" $dir/public/node/*
...@@ -99,12 +97,9 @@ do ...@@ -99,12 +97,9 @@ do
mkdir -p $dir/public/ui mkdir -p $dir/public/ui
cp -rf /home/config_files/ui/* $dir/ui/ cp -rf /home/config_files/ui/* $dir/ui/
cp -rf /home/config_files/ui/* $dir/public/ui/ cp -rf /home/config_files/ui/* $dir/public/ui/
sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/g" $dir/ui/* sed -i "s/target_host_name/${IP_host}/g" $dir/ui/*
sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/g" $dir/public/ui/* sed -i "s/target_host_name/${IP_host}/g" $dir/public/ui/*
#if [ $ip_last_num -lt 100 ]; then
# sed -i "s/target_host_name:7/${public_ip}:${ip_last_num}/g" $dir/public/ui/*
#else
#fi
sed -i "s/ip_last/$ip_last_num/g" $dir/public/ui/* sed -i "s/ip_last/$ip_last_num/g" $dir/public/ui/*
sed -i "s/ip_last/$ip_last_num/g" $dir/ui/* sed -i "s/ip_last/$ip_last_num/g" $dir/ui/*
...@@ -114,23 +109,18 @@ do ...@@ -114,23 +109,18 @@ do
{ {
pro=`echo $multi | awk -F '|' '{print $1}'` pro=`echo $multi | awk -F '|' '{print $1}'`
port=`echo $multi | awk -F '|' '{print $2}'` port=`echo $multi | awk -F '|' '{print $2}'`
#find $dir/public/ -type f -print | xargs -i sed -i "s/${IP_host_first}${ip_last_num}:$port/${pro}-${ip_last_num}.${public_ip}/g" {} sed -i "s/${IP_host}:$port/${pro}-${ip_last_num}.${public_ip}/g" $dir/public/java/*
#echo "sed -i "s/${IP_host_first}${ip_last_num}:$port/${pro}-${ip_last_num}.${public_ip}/g" $dir/public/*" sed -i "s/${IP_host}:$port/${pro}-${ip_last_num}.${public_ip}/g" $dir/public/node/*
sed -i "s/${IP_host_first}${ip_last_num}:$port/${pro}-${ip_last_num}.${public_ip}/g" $dir/public/java/* sed -i "s/${IP_host}:$port/${pro}-${ip_last_num}.${public_ip}/g" $dir/public/ui/*
sed -i "s/${IP_host_first}${ip_last_num}:$port/${pro}-${ip_last_num}.${public_ip}/g" $dir/public/node/*
sed -i "s/${IP_host_first}${ip_last_num}:$port/${pro}-${ip_last_num}.${public_ip}/g" $dir/public/ui/*
} }
done done
#find $dir/public/ -type f -print | xargs -i sed -i "s/${IP_host_first}${ip_last_num}/www.${public_ip}/g" {}
#ngxin conf.d发布 #ngxin conf.d发布
mkdir -p $dir/nginx_conf.d mkdir -p $dir/nginx_conf.d
cp -rf /home/config_files/nginx_conf.d/* $dir/nginx_conf.d/ cp -rf /home/config_files/nginx_conf.d/* $dir/nginx_conf.d/
#baitiao pem发布 #baitiao pem发布
mkdir -p $dir/pem_file mkdir -p $dir/pem_file
cp -rf /home/config_files/pem_file/* $dir/pem_file/ cp -rf /home/config_files/pem_file/* $dir/pem_file/
# sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/" $dir/nginx_conf.d/* echo "`date +%T.%N` 结束 ${IP_host}"
echo "`date +%T.%N` 结束 ${IP_host_first}${ip_last_num}"
echo "---------" echo "---------"
echo >&1000 echo >&1000
}& }&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment