--- a/components/openstack/nova/files/nova-objectstore.xml	Fri Mar 20 03:13:26 2015 -0700
+++ b/components/openstack/nova/files/nova-objectstore.xml	Thu Mar 19 14:41: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) 2014, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 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,11 +30,22 @@
       <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/nova/nova-upgrade' />
+    </dependency>
+
     <dependency name='ntp' grouping='optional_all' restart_on='none'
       type='service'>
       <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"
@@ -59,7 +70,7 @@
     <template>
       <common_name>
         <loctext xml:lang="C">
-          OpenStack Nova Object Store Service 
+          OpenStack Nova Object Store Service
         </loctext>
       </common_name>
       <description>