--- a/components/openstack/neutron/files/services/vpn/device_drivers/solaris_ipsec.py	Tue Sep 06 00:08:13 2016 -0700
+++ b/components/openstack/neutron/files/services/vpn/device_drivers/solaris_ipsec.py	Mon Sep 19 13:40:23 2016 -0700
@@ -1235,14 +1235,14 @@
         try:
             vpnaas = config.get('DEFAULT', 'service_plugins')
             for arg in vpnaas.split(","):
-                if re.match(r'\bvpnaas\b', arg):
+                if re.search(r'\bvpnaas\b', arg):
                     not_configured = False
                     break
         except:
             pass
 
         if not_configured:
-            LOG.info("VPNaaS has not been configured.")
+            LOG.info("VPNaaS has not been enabled as a service_plugin.")
             return
 
         self.processes = {}