--- a/components/openstack/neutron/files/neutron-metadata-agent.xml	Fri Jun 05 14:58:42 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"