--- a/components/openstack/glance/files/glance-api.xml Thu Apr 16 01:36:32 2015 -0700
+++ b/components/openstack/glance/files/glance-api.xml Mon Apr 20 12:35:51 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,8 +30,14 @@
<service_fmri value='svc:/milestone/multi-user:default' />
</dependency>
- <!-- create a dependency on the glance_db service so the glance-api and
- glance-registry services do not collide when creating the database -->
+ <dependency name='upgrade' grouping='require_all' restart_on='none'
+ type='service'>
+ <service_fmri value='svc:/application/openstack/glance/glance-upgrade' />
+ </dependency>
+
+ <!-- create a dependency on the glance-db service so the glance-api,
+ glance-registry, and glance-scrubber services do not collide when
+ creating the database -->
<dependency name='glance_db' grouping='optional_all' restart_on='error'
type='service'>
<service_fmri value='svc:/application/openstack/glance/glance-db'/>
@@ -42,6 +48,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"