--- a/components/openstack/neutron/files/agent/evs_l3_agent.py	Mon Jun 01 09:37:56 2015 -0700
+++ b/components/openstack/neutron/files/agent/evs_l3_agent.py	Tue Jun 02 12:43:22 2015 -0600
@@ -351,10 +351,10 @@
             elif (l2type == 'vlan' and
                   self.conf.get("external_network_datalink", None)):
                 LOG.warning(_("external_network_datalink is deprecated in "
-                             "Juno and will be removed in the next release of "
-                             "Solaris OpenStack. Please use the evsadm "
-                             "set-controlprop subcommand to setup the "
-                             "uplink-port for an external network"))
+                              "Juno and will be removed in the next release "
+                              "of Solaris OpenStack. Please use the evsadm "
+                              "set-controlprop subcommand to setup the "
+                              "uplink-port for an external network"))
                 # proceed with the old-style of doing things
                 mac_address = ex_gw_port['mac_address']
                 dl.create_vnic(self.conf.external_network_datalink,

--- a/components/openstack/neutron/files/agent/solaris/interface.py	Mon Jun 01 09:37:56 2015 -0700
+++ b/components/openstack/neutron/files/agent/solaris/interface.py	Tue Jun 02 12:43:22 2015 -0600
@@ -102,13 +102,13 @@
                    '%s/%s' % (evsname, vportname)]
             utils.execute(cmd)
 
-        dl.connect_vnic(evs_vport, tenant_id)
-
         if not protection:
             cmd = ['/usr/sbin/evsadm', 'set-vportprop', '-T', tenant_id,
                    '-p', 'protection=none', evs_vport]
             utils.execute(cmd)
 
+        dl.connect_vnic(evs_vport, tenant_id)
+
     def unplug(self, device_name, namespace=None, prefix=None):
         """Unplug the interface."""
 

--- a/components/openstack/neutron/files/neutron-dhcp-agent.xml	Mon Jun 01 09:37:56 2015 -0700
+++ b/components/openstack/neutron/files/neutron-dhcp-agent.xml	Tue Jun 02 12:43:22 2015 -0600
@@ -73,6 +73,11 @@
       <service_fmri value='svc:/network/amqp/rabbitmq'/>
     </dependency>
 
+    <dependency name='neutron-server' grouping='optional_all' restart_on='none'
+      type='service'>
+      <service_fmri value='svc:/application/openstack/neutron/neutron-server'/>
+    </dependency>
+
     <logfile_attributes permissions='600'/>
 
     <exec_method timeout_seconds="60" type="method" name="start"

--- a/components/openstack/neutron/files/neutron-l3-agent.xml	Mon Jun 01 09:37:56 2015 -0700
+++ b/components/openstack/neutron/files/neutron-l3-agent.xml	Tue Jun 02 12:43:22 2015 -0600
@@ -51,6 +51,11 @@
       <service_fmri value='svc:/network/amqp/rabbitmq'/>
     </dependency>
 
+    <dependency name='neutron-server' grouping='optional_all' restart_on='none'
+      type='service'>
+      <service_fmri value='svc:/application/openstack/neutron/neutron-server'/>
+    </dependency>
+
     <logfile_attributes permissions='600'/>
 
     <exec_method timeout_seconds="60" type="method" name="start"

--- a/components/openstack/neutron/files/neutron-metadata-agent.xml	Mon Jun 01 09:37:56 2015 -0700
+++ b/components/openstack/neutron/files/neutron-metadata-agent.xml	Tue Jun 02 12:43:22 2015 -0600
@@ -46,6 +46,11 @@
       <service_fmri value='svc:/network/amqp/rabbitmq'/>
     </dependency>
 
+    <dependency name='neutron-server' grouping='optional_all' restart_on='none'
+      type='service'>
+      <service_fmri value='svc:/application/openstack/neutron/neutron-server'/>
+    </dependency>
+
     <logfile_attributes permissions='600'/>
 
     <exec_method timeout_seconds="60" type="method" name="start"