You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/12/27 10:48:47 UTC
[08/12] git commit: updated refs/heads/master to ea09c04
CLOUDSTACK-5592 ssh should run on eth1 interface in ssvm/cpvm running in HyperV
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/238eda30
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/238eda30
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/238eda30
Branch: refs/heads/master
Commit: 238eda30ae1cfa56bf28818dceaecd15900f2963
Parents: dcf8ddf
Author: Rajesh Battala <ra...@citrix.com>
Authored: Sun Dec 22 17:59:46 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Fri Dec 27 14:57:52 2013 +0530
----------------------------------------------------------------------
.../patches/debian/config/etc/init.d/cloud-early-config | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/238eda30/systemvm/patches/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 05661fc..d6dc8f0 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -29,6 +29,8 @@
PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
#set -x
#exec 3>&0 4>&1 > /var/log/test.log 2>&1
+#start hv_kvp daemon
+/usr/sbin/hv_kvp_daemon
# Fix haproxy directory issue
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
#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 5
cp -f /var/opt/hyperv/.kvp_pool_0 /var/cache/cloud/cmdline
+ cat /dev/null > /var/opt/hyperv/.kvp_pool_0
;;
esac
@@ -987,7 +991,7 @@ EOF
fi
if [ -n "$MGMTNET" -a -n "$LOCAL_GW" ]
then
- if [ "$hyp" == "vmware" ]
+ if [ "$hyp" == "vmware" ] || [ "$hyp" == "hyperv" ];
then
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
- if [ "$hyp" == "vmware" ]; then
+ if [ "$hyp" == "vmware" ] || [ "$hyp" == "hyperv" ]; then
setup_sshd $ETH1_IP "eth1"
else
setup_sshd $ETH0_IP "eth0"
@@ -1113,7 +1117,7 @@ setup_console_proxy() {
echo "$public_ip $NAME" >> /etc/hosts
cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules.v4
cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules
- if [ "$hyp" == "vmware" ]; then
+ if [ "$hyp" == "vmware" ] || [ "$hyp" == "hyperv" ]; then
setup_sshd $ETH1_IP "eth1"
else
setup_sshd $ETH0_IP "eth0"