--- a/components/openstack/cinder/files/cinder-api.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/cinder/files/cinder-api.xml Fri Jun 12 10:44:04 2015 -0700
@@ -50,7 +50,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/cinder/files/cinder-backup.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/cinder/files/cinder-backup.xml Fri Jun 12 10:44:04 2015 -0700
@@ -50,7 +50,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/cinder/files/cinder-scheduler.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/cinder/files/cinder-scheduler.xml Fri Jun 12 10:44:04 2015 -0700
@@ -50,7 +50,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/cinder/files/cinder-volume.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/cinder/files/cinder-volume.xml Fri Jun 12 10:44:04 2015 -0700
@@ -77,7 +77,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<exec_method timeout_seconds="60" type="method" name="start"
--- a/components/openstack/glance/files/glance-api.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/glance/files/glance-api.xml Fri Jun 12 10:44:04 2015 -0700
@@ -50,7 +50,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/glance/files/glance-registry.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/glance/files/glance-registry.xml Fri Jun 12 10:44:04 2015 -0700
@@ -50,7 +50,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/glance/files/glance-scrubber.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/glance/files/glance-scrubber.xml Fri Jun 12 10:44:04 2015 -0700
@@ -50,7 +50,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/heat/files/heat-api-cfn.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/heat/files/heat-api-cfn.xml Fri Jun 12 10:44:04 2015 -0700
@@ -49,7 +49,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/heat/files/heat-api-cloudwatch.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/heat/files/heat-api-cloudwatch.xml Fri Jun 12 10:44:04 2015 -0700
@@ -49,7 +49,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/heat/files/heat-api.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/heat/files/heat-api.xml Fri Jun 12 10:44:04 2015 -0700
@@ -49,7 +49,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/heat/files/heat-engine.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/heat/files/heat-engine.xml Fri Jun 12 10:44:04 2015 -0700
@@ -49,7 +49,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/keystone/files/keystone.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/keystone/files/keystone.xml Fri Jun 12 10:44:04 2015 -0700
@@ -48,7 +48,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/neutron/files/neutron-dhcp-agent.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/neutron/files/neutron-dhcp-agent.xml Fri Jun 12 10:44:04 2015 -0700
@@ -70,7 +70,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<dependency name='neutron-server' grouping='optional_all' restart_on='none'
--- a/components/openstack/neutron/files/neutron-l3-agent.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/neutron/files/neutron-l3-agent.xml Fri Jun 12 10:44:04 2015 -0700
@@ -48,7 +48,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<dependency name='neutron-server' grouping='optional_all' restart_on='none'
--- a/components/openstack/neutron/files/neutron-metadata-agent.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/neutron/files/neutron-metadata-agent.xml Fri Jun 12 10:44:04 2015 -0700
@@ -43,7 +43,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<dependency name='neutron-server' grouping='optional_all' restart_on='none'
--- a/components/openstack/neutron/files/neutron-server.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/neutron/files/neutron-server.xml Fri Jun 12 10:44:04 2015 -0700
@@ -48,7 +48,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/nova/files/nova-api-ec2.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/nova/files/nova-api-ec2.xml Fri Jun 12 10:44:04 2015 -0700
@@ -43,7 +43,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/nova/files/nova-api-metadata.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/nova/files/nova-api-metadata.xml Fri Jun 12 10:44:04 2015 -0700
@@ -43,7 +43,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/nova/files/nova-api-osapi-compute.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/nova/files/nova-api-osapi-compute.xml Fri Jun 12 10:44:04 2015 -0700
@@ -43,7 +43,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/nova/files/nova-cert.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/nova/files/nova-cert.xml Fri Jun 12 10:44:04 2015 -0700
@@ -48,7 +48,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/nova/files/nova-compute.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/nova/files/nova-compute.xml Fri Jun 12 10:44:04 2015 -0700
@@ -53,7 +53,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/nova/files/nova-conductor.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/nova/files/nova-conductor.xml Fri Jun 12 10:44:04 2015 -0700
@@ -48,7 +48,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/nova/files/nova-consoleauth.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/nova/files/nova-consoleauth.xml Fri Jun 12 10:44:04 2015 -0700
@@ -43,7 +43,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/nova/files/nova-novncproxy.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/nova/files/nova-novncproxy.xml Fri Jun 12 10:44:04 2015 -0700
@@ -43,7 +43,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/nova/files/nova-objectstore.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/nova/files/nova-objectstore.xml Fri Jun 12 10:44:04 2015 -0700
@@ -43,7 +43,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>
--- a/components/openstack/nova/files/nova-scheduler.xml Fri Jun 12 09:02:39 2015 -0700
+++ b/components/openstack/nova/files/nova-scheduler.xml Fri Jun 12 10:44:04 2015 -0700
@@ -48,7 +48,7 @@
<dependency name='rabbitmq' grouping='optional_all' restart_on='none'
type='service'>
- <service_fmri value='svc:/network/amqp/rabbitmq'/>
+ <service_fmri value='svc:/application/rabbitmq'/>
</dependency>
<logfile_attributes permissions='600'/>