Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DBB8010069 for ; Tue, 17 Mar 2015 07:54:21 +0000 (UTC) Received: (qmail 30650 invoked by uid 500); 17 Mar 2015 07:54:21 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 30618 invoked by uid 500); 17 Mar 2015 07:54:21 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 30608 invoked by uid 99); 17 Mar 2015 07:54:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Mar 2015 07:54:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8E6B9E0990; Tue, 17 Mar 2015 07:54:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: <80a17b924810451ea1b75a24686e39ba@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to e3c04c7 Date: Tue, 17 Mar 2015 07:54:21 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master e4fe7b3bb -> e3c04c714 savepassword: use eth0's IP address, as password server listens on that IP Signed-off-by: Rohit Yadav (cherry picked from commit 488625b1937eeb38f9a29706b6e7333043ae3e6e) Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e3c04c71 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e3c04c71 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e3c04c71 Branch: refs/heads/master Commit: e3c04c7147abfa97bc422ca6d742bf6606fd7ec7 Parents: e4fe7b3 Author: Rohit Yadav Authored: Tue Mar 17 13:23:27 2015 +0530 Committer: Rohit Yadav Committed: Tue Mar 17 13:24:06 2015 +0530 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e3c04c71/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh b/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh index 5b1f5e6..4a870fb 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh +++ b/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh @@ -30,6 +30,7 @@ do ;; esac done +SERVER_IP=$(/sbin/ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}') TOKEN_FILE="/tmp/passwdsrvrtoken" TOKEN="" if [ -f $TOKEN_FILE ]; then @@ -38,5 +39,5 @@ fi ps aux | grep passwd_server_ip.py |grep -v grep 2>&1 > /dev/null if [ $? -eq 0 ] then - curl --header "DomU_Request: save_password" http://127.0.0.1:8080/ -F "ip=$VM_IP" -F "password=$PASSWORD" -F "token=$TOKEN" + curl --header "DomU_Request: save_password" "http://$SERVER_IP:8080/" -F "ip=$VM_IP" -F "password=$PASSWORD" -F "token=$TOKEN" fi