equal
deleted
inserted
replaced
1233 sys.exit(1) |
1233 sys.exit(1) |
1234 |
1234 |
1235 try: |
1235 try: |
1236 vpnaas = config.get('DEFAULT', 'service_plugins') |
1236 vpnaas = config.get('DEFAULT', 'service_plugins') |
1237 for arg in vpnaas.split(","): |
1237 for arg in vpnaas.split(","): |
1238 if re.match(r'\bvpnaas\b', arg): |
1238 if re.search(r'\bvpnaas\b', arg): |
1239 not_configured = False |
1239 not_configured = False |
1240 break |
1240 break |
1241 except: |
1241 except: |
1242 pass |
1242 pass |
1243 |
1243 |
1244 if not_configured: |
1244 if not_configured: |
1245 LOG.info("VPNaaS has not been configured.") |
1245 LOG.info("VPNaaS has not been enabled as a service_plugin.") |
1246 return |
1246 return |
1247 |
1247 |
1248 self.processes = {} |
1248 self.processes = {} |
1249 self.process_status_cache = {} |
1249 self.process_status_cache = {} |
1250 |
1250 |