Merge "Fix resource ordering for Ceilometer controller task"

deployment/puppet/osnailyfacter/modular/ceilometer/tasks.yaml

@@ -3,10 +3,10 @@
   version: 2.0.0
   cross-depends:
     - name: ceilometer-keystone
-    - name: /(primary-)?mongo/
+    - name: /top-role-(primary-)?mongo/
   groups: [primary-controller, controller]
-  required_for: [primary-openstack-controller, openstack-controller, swift]
-  requires: [mongo, primary-mongo, openstack-haproxy]
+  required_for: [primary-openstack-controller, openstack-controller]
+  requires: [openstack-haproxy]
   condition: "settings:additional_components.ceilometer.value == true"
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ceilometer/controller.pp
@@ -43,7 +43,7 @@
   condition: "settings:additional_components.ceilometer.value == true"
   requires: [primary-keystone, keystone]
   cross-depends:
-    - name: keystone
+    - name: /(primary-)?keystone/
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ceilometer/keystone.pp
     puppet_modules: /etc/puppet/modules

deployment/puppet/osnailyfacter/modular/roles/tasks.yaml

@@ -66,7 +66,7 @@
   version: 2.0.0
   groups: [mongo]
   cross-depends:
-    - name: primary-mongo
+    - name: top-role-primary-mongo
   required_for: [deploy_end]
   requires: [hosts, firewall]
   parameters:

deployment/puppet/osnailyfacter/modular/swift/tasks.yaml

@@ -25,6 +25,7 @@
     - name: /(primary-)?rabbitmq/
     - name: swift-keystone
     - name: memcached
+    - name: ceilometer-controller
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/swift/swift.pp
     puppet_modules: /etc/puppet/modules