From 978a6f2ff8fb938aad13f80d9762c5bae551874b Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Thu, 29 May 2008 17:26:36 +0000 Subject: [PATCH] Do not wait for slices to exist before adding to vsys config and acls. --- vsys.py | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/vsys.py b/vsys.py index 5766f82..5d34123 100644 --- a/vsys.py +++ b/vsys.py @@ -5,7 +5,6 @@ import logger import os -import vserver from sets import Set VSYSCONF="/etc/vsys.conf" @@ -28,26 +27,19 @@ def GetSlivers(data): for sliver in data['slivers']: for attribute in sliver['attributes']: if attribute['name'] == 'vsys': - # Check to see if sliver is running. If not, continue - try: - if vserver.VServer(sliver['name']).is_running(): - if sliver['name'] not in slices: - # add to conf - slices.append(sliver['name']) - # As the name implies, when we find an attribute, we - createVsysDir(sliver['name']) - # add it to our list of slivers that need vsys - if attribute['value'] in scripts.keys(): - scripts[attribute['value']].append(sliver['name']) - except: - logger.log("vsys: sliver %s not running yet. Deferring." \ - % sliver['name']) - pass + if sliver['name'] not in slices: + # add to conf + slices.append(sliver['name']) + # As the name implies, when we find an attribute, we + createVsysDir(sliver['name']) + # add it to our list of slivers that need vsys + if attribute['value'] in scripts.keys(): + scripts[attribute['value']].append(sliver['name']) # Write the conf writeConf(slices, parseConf()) # Write out the ACLs - if writeAcls(scripts, parseAcls()): + if writeAcls(scripts, parseAcls()): logger.log("vsys: restarting vsys service") os.system("/etc/init.d/vsys restart") -- 2.43.0