In-house patch to add support for Solaris 11.3 and 12.0.  This patch
has not yet been submitted upstream due to requirements for 3rd party
CI testing.

--- openstack-neutron-8.2.0/manifests/init.pp.orig     2016-08-07 11:28:30.964369624 -0700
+++ openstack-neutron-8.2.0/manifests/init.pp     2016-08-07 11:30:09.644420742 -0700
@@ -292,7 +292,7 @@ class neutron (
   $allow_sorting                      = $::os_service_default,
   $allow_overlapping_ips              = $::os_service_default,
   $api_extensions_path                = $::os_service_default,
-  $root_helper                        = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
+  $root_helper                        = undef,
   $root_helper_daemon                 = $::os_service_default,
   $report_interval                    = $::os_service_default,
   $memcache_servers                   = false,
@@ -416,11 +416,16 @@ class neutron (
     'DEFAULT/rpc_response_timeout':    value => $rpc_response_timeout;
     'DEFAULT/global_physnet_mtu':      value => pick($network_device_mtu, $global_physnet_mtu);
     'oslo_concurrency/lock_path':      value => $lock_path;
-    'agent/root_helper':               value => $root_helper;
     'agent/root_helper_daemon':        value => $root_helper_daemon;
     'agent/report_interval':           value => $report_interval;
   }

+  if $root_helper {
+    neutron_config {
+      'agent/root_helper': value => $root_helper;
+    }
+  }
+
   if $log_file {
     neutron_config {
       'DEFAULT/log_file': value => $log_file;