cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [cloudstack] branch master updated: CLOUDSTACK-9749: Disable password service on ilb systemvm (#1912)
Date Thu, 03 Aug 2017 20:38:28 GMT
This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new 1414d20  CLOUDSTACK-9749: Disable password service on ilb systemvm (#1912)
1414d20 is described below

commit 1414d20852f9df190189152dd73d81e5980ed839
Author: Frank Maximus <the.evergreen@gmail.com>
AuthorDate: Thu Aug 3 22:38:25 2017 +0200

    CLOUDSTACK-9749: Disable password service on ilb systemvm (#1912)
    
    Fix cloud-password-srvr correctly.
    Made sure it runs on VPC VR, but not on Internal LB
---
 systemvm/patches/debian/config/etc/init.d/cloud-early-config  | 1 +
 systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

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 ac54ebf..3bdebdb 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -1032,6 +1032,7 @@ EOF
   enable_irqbalance 1
   enable_vpc_rpsrfs 1
   enable_svc cloud 0
+  enable_svc cloud-passwd-srvr 1
   disable_rpfilter
   enable_fwding 1
   cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules.v4
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip b/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip
index a408a1e..5e15a19 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip
+++ b/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip
@@ -18,7 +18,6 @@
 
 . /etc/default/cloud-passwd-srvr
 addr=$1;
-ENABLED=1
 while [ "$ENABLED" == "1" ]
 do
     python /opt/cloud/bin/passwd_server_ip.py $addr >/dev/null 2>/dev/null

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].

Mime
View raw message