Bug fix

[nodemanager.git] / plugins / planetstack-net.py

diff --git a/plugins/planetstack-net.py b/plugins/planetstack-net.py
index 0fc0bf6..f47b63d 100644 (file)
--- a/plugins/planetstack-net.py
+++ b/plugins/planetstack-net.py
@@ -36,7 +36,7 @@ nat_net_name = "nat-net"
 nat_net_id = None
 site_net_id = None
 
-quantum_auth_url = "http://viccidev1:5000/v2.0/"
+quantum_auth_url = None
 quantum_username = None
 quantum_password = None
 quantum_tenant_name = None
@@ -257,7 +257,7 @@ def write_dnsmasq_hostsfile(dev, ports, net_id):
 # the nat:forward_ports field in the Port record.
 def set_up_port_forwarding(dev, ports):
     for port in ports:
-        if port['network_id'] == nat_net_id:
+        if port['network_id'] == nat_net_id and port['nat:forward_ports']:
             for fw in port['nat:forward_ports']:
                 ipaddr = port['fixed_ips'][0]['ip_address']
                 protocol = fw['l4_protocol']
@@ -283,6 +283,7 @@ def start():
     global quantum_username
     global quantum_password
     global quantum_tenant_name
+    global quantum_auth_url
 
     logger.log("%s: plugin starting up..." % plugin)
 
@@ -291,7 +292,7 @@ def start():
     quantum_username = parser.get("DEFAULT", "quantum_admin_username")
     quantum_password = parser.get("DEFAULT", "quantum_admin_password")
     quantum_tenant_name = parser.get("DEFAULT", "quantum_admin_tenant_name")
-
+    quantum_auth_url = parser.get("DEFAULT", "quantum_admin_auth_url")
 
 def GetSlivers(data, config=None, plc=None):
     global nat_net_id