--- a/components/openstack/neutron/files/neutron-dhcp-agent.xml	Tue Apr 07 15:49:29 2015 -0700
+++ b/components/openstack/neutron/files/neutron-dhcp-agent.xml	Tue Apr 07 13:31:20 2015 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
 <!--
- Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2015, 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
@@ -30,6 +30,12 @@
       <service_fmri value='svc:/milestone/multi-user:default' />
     </dependency>
 
+    <dependency name='upgrade' grouping='require_all' restart_on='none'
+      type='service'>
+      <service_fmri
+        value='svc:/application/openstack/neutron/neutron-upgrade' />
+    </dependency>
+
     <!-- neutron-dhcp-agent uses dnsmasq which is incompatible with running
          BIND, ISC DHCP, and TFTP -->
     <dependency name='exclude-bind' grouping='exclude_all' restart_on='none'
@@ -62,6 +68,11 @@
       <service_fmri value='svc:/network/ntp'/>
     </dependency>
 
+    <dependency name='rabbitmq' grouping='optional_all' restart_on='none'
+      type='service'>
+      <service_fmri value='svc:/network/amqp/rabbitmq'/>
+    </dependency>
+
     <logfile_attributes permissions='600'/>
 
     <exec_method timeout_seconds="60" type="method" name="start"
@@ -74,7 +85,8 @@
     <exec_method timeout_seconds="600" type="method" name="stop"
       exec="/lib/svc/method/neutron-dhcp-agent %m %{restarter/contract}">
       <method_context>
-        <method_credential user='neutron' group='neutron' />
+        <!-- sys_ip_config is required to set 'hostmodel' ipadm property -->
+        <method_credential user='neutron' group='neutron' privileges='basic,sys_ip_config' />
       </method_context>
     </exec_method>