Merge "sort the element-deps to please dib-lint"

2014-04-24 18:22:00 +00:00 · 2014-04-24 18:22:00 +00:00 · 986a681f7b
parent bc89f3ee42 9481784a11
commit 986a681f7b
20 changed files with 28 additions and 28 deletions
--- a/elements/boot-stack/element-deps
+++ b/elements/boot-stack/element-deps
@ -4,10 +4,10 @@ heat-engine
 iptables
 keystone
 mysql
+neutron-openvswitch-agent
+neutron-server
 nova-api
 openstack-clients
 os-apply-config
 os-refresh-config
 os-svc-install
-neutron-openvswitch-agent
-neutron-server
--- a/elements/cinder-api/element-deps
+++ b/elements/cinder-api/element-deps
@ -1,5 +1,5 @@
 cinder
-os-svc-install
 os-refresh-config
+os-svc-install
 source-repositories
 use-ephemeral
--- a/elements/cinder/element-deps
+++ b/elements/cinder/element-deps
@ -1,6 +1,6 @@
 iptables
-os-svc-install
-os-refresh-config
 os-apply-config
+os-refresh-config
+os-svc-install
 source-repositories
 use-ephemeral
--- a/elements/devstack/element-deps
+++ b/elements/devstack/element-deps
@ -1,2 +1,2 @@
-stackuser
 source-repositories
+stackuser
--- a/elements/diskimage-builder/element-deps
+++ b/elements/diskimage-builder/element-deps
@ -1,2 +1,2 @@
-source-repositories
 pip-and-virtualenv
+source-repositories
--- a/elements/geard/element-deps
+++ b/elements/geard/element-deps
@ -1,2 +1,2 @@
-os-svc-install
 os-refresh-config
+os-svc-install
--- a/elements/glance/element-deps
+++ b/elements/glance/element-deps
@ -1,5 +1,5 @@
 iptables
-os-svc-install
-os-refresh-config
 os-apply-config
+os-refresh-config
+os-svc-install
 source-repositories
--- a/elements/heat/element-deps
+++ b/elements/heat/element-deps
@ -1,4 +1,4 @@
-os-svc-install
 os-apply-config
 os-refresh-config
+os-svc-install
 source-repositories
--- a/elements/nagios3/element-deps
+++ b/elements/nagios3/element-deps
@ -1,5 +1,5 @@
+apache2
+openstack-clients
 os-apply-config
 os-refresh-config
 postfix
-apache2
-openstack-clients
--- a/elements/neutron/element-deps
+++ b/elements/neutron/element-deps
@ -1,5 +1,5 @@
 iptables
-os-svc-install
 os-apply-config
 os-refresh-config
+os-svc-install
 source-repositories
--- a/elements/nova/element-deps
+++ b/elements/nova/element-deps
@ -1,4 +1,4 @@
-os-svc-install
 os-apply-config
 os-refresh-config
+os-svc-install
 source-repositories
--- a/elements/openstack-clients/element-deps
+++ b/elements/openstack-clients/element-deps
@ -1,3 +1,3 @@
-source-repositories
 pip-and-virtualenv
 pip-manifest
+source-repositories
--- a/elements/os-collect-config/element-deps
+++ b/elements/os-collect-config/element-deps
@ -1,4 +1,4 @@
-source-repositories
-os-refresh-config
 os-apply-config
+os-refresh-config
 pip-manifest
+source-repositories
--- a/elements/os-refresh-config/element-deps
+++ b/elements/os-refresh-config/element-deps
@ -1,5 +1,5 @@
-pip-and-virtualenv
-source-repositories
-os-collect-config
 os-apply-config
+os-collect-config
+pip-and-virtualenv
 pip-manifest
+source-repositories
--- a/elements/qpidd/element-deps
+++ b/elements/qpidd/element-deps
@ -1,2 +1,2 @@
-os-refresh-config
 os-apply-config
+os-refresh-config
--- a/elements/rabbitmq-server/element-deps
+++ b/elements/rabbitmq-server/element-deps
@ -1,3 +1,3 @@
 iptables
-os-refresh-config
 os-apply-config
+os-refresh-config
--- a/elements/snmpd/element-deps
+++ b/elements/snmpd/element-deps
@ -1 +1 @@
-os-apply-config
+os-apply-config
--- a/elements/swift-proxy/element-deps
+++ b/elements/swift-proxy/element-deps
@ -1,2 +1,2 @@
-swift
 memcached
+swift
--- a/elements/tripleo-cd/element-deps
+++ b/elements/tripleo-cd/element-deps
@ -1,2 +1,2 @@
-source-repositories
 pypi-mirror
+source-repositories
--- a/elements/tuskar/element-deps
+++ b/elements/tuskar/element-deps
@ -1,4 +1,4 @@
-os-svc-install
-os-refresh-config
 os-apply-config
+os-refresh-config
+os-svc-install
 source-repositories