cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 017c42b
Date Tue, 28 Feb 2017 00:26:34 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 48cbef6d2 -> 017c42b62


Fix public IPs not being removed from the VR when deprovisioned


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23f64a13
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23f64a13
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23f64a13

Branch: refs/heads/master
Commit: 23f64a13a85b89518860eb3600ed7652ebbc89ba
Parents: 50147a4
Author: Will Stevens <williamstevens@gmail.com>
Authored: Wed Feb 22 13:08:11 2017 -0500
Committer: Will Stevens <williamstevens@gmail.com>
Committed: Wed Feb 22 13:08:11 2017 -0500

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23f64a13/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
index a16fd07..5786cd4 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
@@ -106,6 +106,10 @@ class CsAddress(CsDataBag):
                 ip.setAddress(address)
                 logging.info("Address found in DataBag ==> %s" % address)
 
+                if not address['add'] and not ip.configured():
+                    logging.info("Skipping %s as the add flag is set to %s " % (address['public_ip'],
address['add']))
+                    continue
+
                 if ip.configured():
                     logging.info(
                         "Address %s on device %s already configured", ip.ip(), dev)


Mime
View raw message