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

CLOUDSTACK-5592 ssh should run on eth1 interface in ssvm/cpvm running in HyperV

Browse Source
This commit is contained in:
Rajesh Battala 2013-12-22 17:59:46 +05:30
parent dcf8ddfb24
commit 238eda30ae
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,8 @@
PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
#set -x #set -x
#exec 3>&0 4>&1 > /var/log/test.log 2>&1 #exec 3>&0 4>&1 > /var/log/test.log 2>&1
#start hv_kvp daemon
/usr/sbin/hv_kvp_daemon
# Fix haproxy directory issue # Fix haproxy directory issue
mkdir -p /var/lib/haproxy mkdir -p /var/lib/haproxy
@ -134,7 +136,9 @@ get_boot_params() {
# Hyper-V is recognized as virtualpc hypervisor type. Boot args are passed using KVP Daemon # Hyper-V is recognized as virtualpc hypervisor type. Boot args are passed using KVP Daemon
#waiting for the hv_kvp_daemon to start up #waiting for the hv_kvp_daemon to start up
#sleep 30 need to fix the race condition of hv_kvp_daemon and cloud-early-config #sleep 30 need to fix the race condition of hv_kvp_daemon and cloud-early-config
sleep 5
cp -f /var/opt/hyperv/.kvp_pool_0 /var/cache/cloud/cmdline cp -f /var/opt/hyperv/.kvp_pool_0 /var/cache/cloud/cmdline
cat /dev/null > /var/opt/hyperv/.kvp_pool_0
;; ;;
esac esac
@ -987,7 +991,7 @@ EOF
fi fi
if [ -n "$MGMTNET" -a -n "$LOCAL_GW" ] if [ -n "$MGMTNET" -a -n "$LOCAL_GW" ]
then then
if [ "$hyp" == "vmware" ] if [ "$hyp" == "vmware" ] || [ "$hyp" == "hyperv" ];
then then
ip route add $MGMTNET via $LOCAL_GW dev eth0 ip route add $MGMTNET via $LOCAL_GW dev eth0
@ -1087,7 +1091,7 @@ setup_secstorage() {
cp /etc/iptables/iptables-secstorage /etc/iptables/rules.v4 cp /etc/iptables/iptables-secstorage /etc/iptables/rules.v4
cp /etc/iptables/iptables-secstorage /etc/iptables/rules cp /etc/iptables/iptables-secstorage /etc/iptables/rules
if [ "$hyp" == "vmware" ]; then if [ "$hyp" == "vmware" ] || [ "$hyp" == "hyperv" ]; then
setup_sshd $ETH1_IP "eth1" setup_sshd $ETH1_IP "eth1"
else else
setup_sshd $ETH0_IP "eth0" setup_sshd $ETH0_IP "eth0"
@ -1113,7 +1117,7 @@ setup_console_proxy() {
echo "$public_ip $NAME" >> /etc/hosts echo "$public_ip $NAME" >> /etc/hosts
cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules.v4 cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules.v4
cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules
if [ "$hyp" == "vmware" ]; then if [ "$hyp" == "vmware" ] || [ "$hyp" == "hyperv" ]; then
setup_sshd $ETH1_IP "eth1" setup_sshd $ETH1_IP "eth1"
else else
setup_sshd $ETH0_IP "eth0" setup_sshd $ETH0_IP "eth0"