apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

systemvm: fix socat usage

Browse Source 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 888f67f0bdc3e76c452c2dc3f7715f2df12bda7d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2015-03-30 12:44:52 +05:30
parent 6ac06e5e5e
commit 0540ba1b30
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr
View File

@ -86,16 +86,16 @@ getpid() {
echo $pid echo $pid
} }
stop_socat() { stop_password_server() {
spid=$(pidof socat) spid=$(pidof -s python passwd_server_ip.py)
[ "$spid" != "" ] && kill -9 $spid && echo "Killed socat (pid=$spid)" [ "$spid" != "" ] && kill -9 $spid && echo "Killed password server (pid=$spid)"
return 0 return 0
} }
stop () { stop () {
stop_socat stop_password_server
pid=$(getpid) pid=$(getpid)
[ "$pid" != "" ] && kill -9 $pid && remove_iptables_rules && echo "Stopped password server (pid=$pid)" && stop_socat && return 0 [ "$pid" != "" ] && kill -9 $pid && remove_iptables_rules && echo "Stopped password server (pid=$pid)" && stop_password_server && return 0
echo "Password server is not running" && return 0 echo "Password server is not running" && return 0
} }

2
systemvm/patches/debian/config/opt/cloud/bin/vpc_guestnw.sh
View File

@ -121,7 +121,7 @@ setup_passwdsvcs() {
desetup_passwdsvcs() { desetup_passwdsvcs() {
logger -t cloud "Desetting up password service for network $ip/$mask, eth $dev " logger -t cloud "Desetting up password service for network $ip/$mask, eth $dev "
sudo iptables -D INPUT -i $dev -d $ip -p tcp -m state --state NEW --dport 8080 -j ACCEPT sudo iptables -D INPUT -i $dev -d $ip -p tcp -m state --state NEW --dport 8080 -j ACCEPT
pid=`ps -ef | grep socat | grep $ip | grep -v grep | awk '{print $2}'` pid=`ps -ef | grep passwd_server_ip.py | grep $ip | grep -v grep | awk '{print $2}'`
if [ -n "$pid" ] if [ -n "$pid" ]
then then
kill -9 $pid kill -9 $pid

2
systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server
View File

@ -25,7 +25,7 @@ do
rc=$? rc=$?
if [ $rc -ne 0 ] if [ $rc -ne 0 ]
then then
logger -t cloud "Password server failed with error code $rc. Restarting socat..." logger -t cloud "Password server failed with error code $rc. Restarting password server..."
sleep 3 sleep 3
fi fi
result=`ip addr show | grep $ip` result=`ip addr show | grep $ip`

4
test/integration/component/maint/test_multiple_ip_ranges.py
View File

@ -362,7 +362,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
def test_03_passwd_service_on_alias_IP(self): def test_03_passwd_service_on_alias_IP(self):
"""Deploy guest vm in new CIDR and verify passwd service on alias ip """Deploy guest vm in new CIDR and verify passwd service on alias ip
1.Deploy guest vm in new cidr 1.Deploy guest vm in new cidr
2.Verify password service(socat) listens on alias ip in VR 2.Verify password service(passwd_server_ip.py) listens on alias ip in VR
""" """
list_router_response = list_routers( list_router_response = list_routers(
self.apiclient, self.apiclient,
@ -403,7 +403,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
# attempt # attempt
SshClient(host.ipaddress, port, username, password) SshClient(host.ipaddress, port, username, password)
proc = "socat" proc = "python passwd_server_ip.py"
result = get_process_status( result = get_process_status(
host.ipaddress, host.ipaddress,
port, port,