--- a/components/openstack/neutron/files/neutron-metadata-agent	Thu May 19 13:53:26 2016 -0700
+++ b/components/openstack/neutron/files/neutron-metadata-agent	Thu May 19 14:00:51 2016 -0700
@@ -1,6 +1,6 @@
 #!/usr/bin/python2.7
 
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -27,8 +27,8 @@
             print '%s does not exist or is not readable' % f
             return smf_include.SMF_EXIT_ERR_CONFIG
 
-    cmd = "/usr/lib/neutron/neutron-metadata-agent --config-file %s " \
-        "--config-file %s" % tuple(sys.argv[2:4])
+    cmd = "/usr/bin/pfexec /usr/lib/neutron/neutron-metadata-agent " \
+          "--config-file %s --config-file %s" % tuple(sys.argv[2:4])
     smf_include.smf_subprocess(cmd)
 
 if __name__ == "__main__":