mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
85aee8d18d
- Refactors and simplifies systemvm codebase file structures keeping the same resultant systemvm.iso packaging - Password server systemd script and new postinit script that runs before sshd starts - Fixes to keepalived and conntrackd config to make rVRs work again - New /etc/issue featuring ascii based cloudmonkey logo/message and systemvmtemplate version - SystemVM python codebase linted and tested. Added pylint/pep to Travis. - iptables re-application fixes for non-VR systemvms. - SystemVM template build fixes. - Default secondary storage vm service offering boosted to have 2vCPUs and RAM equal to console proxy. - Fixes to several marvin based smoke tests, especially rVR related tests. rVR tests to consider 3*advert_int+skew timeout before status is checked. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
159 lines
3.3 KiB
Bash
Executable File
159 lines
3.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
source /root/func.sh
|
|
source /opt/cloud/bin/vpc_func.sh
|
|
|
|
vpnoutmark="0x525"
|
|
vpninmark="0x524"
|
|
lock="biglock"
|
|
locked=$(getLockFile $lock)
|
|
if [ "$locked" != "1" ]
|
|
then
|
|
exit 1
|
|
fi
|
|
|
|
usage() {
|
|
printf "Usage: %s -[c|g|r|n|d] [-l <public gateway>] [-v <vpc cidr>] \n" $(basename $0) >&2
|
|
}
|
|
|
|
create_usage_rules () {
|
|
iptables-save|grep "NETWORK_STATS_$ethDev" > /dev/null
|
|
if [ $? -gt 0 ]
|
|
then
|
|
iptables -N NETWORK_STATS_$ethDev > /dev/null;
|
|
iptables -I FORWARD -j NETWORK_STATS_$ethDev > /dev/null;
|
|
iptables -A NETWORK_STATS_$ethDev -o $ethDev -s $vcidr > /dev/null;
|
|
iptables -A NETWORK_STATS_$ethDev -i $ethDev -d $vcidr > /dev/null;
|
|
fi
|
|
return $?
|
|
}
|
|
|
|
create_vpn_usage_rules () {
|
|
iptables-save|grep "VPN_STATS_$ethDev" > /dev/null
|
|
if [ $? -gt 0 ]
|
|
then
|
|
iptables -t mangle -N VPN_STATS_$ethDev > /dev/null;
|
|
iptables -t mangle -I FORWARD -j VPN_STATS_$ethDev > /dev/null;
|
|
iptables -t mangle -A VPN_STATS_$ethDev -o $ethDev -m mark --mark $vpnoutmark > /dev/null;
|
|
iptables -t mangle -A VPN_STATS_$ethDev -i $ethDev -m mark --mark $vpninmark > /dev/null;
|
|
fi
|
|
return $?
|
|
}
|
|
|
|
remove_usage_rules () {
|
|
return 0
|
|
}
|
|
|
|
get_usage () {
|
|
iptables -L NETWORK_STATS_$ethDev -n -v -x 2> /dev/null | awk '$1 ~ /^[0-9]+$/ { printf "%s:", $2}'; > /dev/null
|
|
return 0
|
|
}
|
|
|
|
get_vpn_usage () {
|
|
iptables -t mangle -L VPN_STATS_$ethDev -n -v -x | awk '$1 ~ /^[0-9]+$/ { printf "%s:", $2}'; > /dev/null
|
|
if [ $? -gt 0 ]
|
|
then
|
|
printf $?
|
|
return 1
|
|
fi
|
|
}
|
|
|
|
reset_usage () {
|
|
iptables -Z NETWORK_STATS_$ethDev > /dev/null
|
|
if [ $? -gt 0 -a $? -ne 2 ]
|
|
then
|
|
return 1
|
|
fi
|
|
}
|
|
|
|
#set -x
|
|
|
|
cflag=
|
|
gflag=
|
|
rflag=
|
|
lflag=
|
|
vflag=
|
|
nflag=
|
|
dflag=
|
|
|
|
while getopts 'cgndrl:v:' OPTION
|
|
do
|
|
case $OPTION in
|
|
c) cflag=1
|
|
;;
|
|
g) gflag=1
|
|
;;
|
|
r) rflag=1
|
|
;;
|
|
l) lflag=1
|
|
publicIp="$OPTARG"
|
|
;;
|
|
v) vflag=1
|
|
vcidr="$OPTARG"
|
|
;;
|
|
n) nflag=1
|
|
;;
|
|
d) dflag=1
|
|
;;
|
|
i) #Do nothing, since it's parameter for host script
|
|
;;
|
|
?) usage
|
|
unlock_exit 2 $lock $locked
|
|
;;
|
|
esac
|
|
done
|
|
|
|
ethDev=$(getEthByIp $publicIp)
|
|
if [ "$cflag" == "1" ]
|
|
then
|
|
if [ "$ethDev" != "" ]
|
|
then
|
|
create_usage_rules
|
|
create_vpn_usage_rules
|
|
unlock_exit 0 $lock $locked
|
|
fi
|
|
fi
|
|
|
|
if [ "$gflag" == "1" ]
|
|
then
|
|
get_usage
|
|
unlock_exit $? $lock $locked
|
|
fi
|
|
|
|
if [ "$nflag" == "1" ]
|
|
then
|
|
#get_vpn_usage
|
|
unlock_exit $? $lock $locked
|
|
fi
|
|
|
|
if [ "$dflag" == "1" ]
|
|
then
|
|
#remove_usage_rules
|
|
unlock_exit 0 $lock $locked
|
|
fi
|
|
|
|
if [ "$rflag" == "1" ]
|
|
then
|
|
reset_usage
|
|
unlock_exit $? $lock $locked
|
|
fi
|
|
|
|
|
|
unlock_exit 0 $lock $locked
|