From c2060987830ab14ba92e2dd9fc66fb5a56c5fed3 Mon Sep 17 00:00:00 2001 From: Will Stevens Date: Wed, 22 Feb 2017 13:08:11 -0500 Subject: [PATCH] Fix public IPs not being removed from the VR when deprovisioned (cherry picked from commit 23f64a13a85b89518860eb3600ed7652ebbc89ba) Signed-off-by: Rohit Yadav --- systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py | 4 ++++ 1 file changed, 4 insertions(+) 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 efe0d6f7e93..43cd6396587 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)