Fix dependencies for cinder-block-device role

Hiera and globals are needed to run cinder task.
Additionally, fixed the role dependency for
cinder-block-device, because it requires the node config
to be done by compute role first.

Change-Id: I01efd03e649157389ac3bdac1103c3207216bd25
Closes-Bug: #1528502

deployment/puppet/deployment_groups/tasks.yaml

@@ -55,7 +55,7 @@
 - id: cinder-block-device
   type: group
   role: [cinder-block-device]
-  requires: [controller]
+  requires: [compute]
   required_for: [deploy_end]
   parameters:
     strategy:

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

@@ -2,7 +2,7 @@
   type: puppet
   version: 2.0.0
   groups: [primary-controller, controller,
-           cinder, cinder-vmware, compute, ceph-osd,
+           cinder, cinder-block-device, cinder-vmware, compute, ceph-osd,
            primary-mongo, mongo, virt, ironic]
   required_for: [deploy_end]
   requires: [hiera]

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

@@ -1,7 +1,8 @@
 - id: hiera
   type: puppet
   version: 2.0.0
-  groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, primary-mongo, mongo, virt, ironic]
+  groups: [primary-controller, controller, cinder, cinder-block-device,
+    cinder-vmware, compute, ceph-osd, primary-mongo, mongo, virt, ironic]
   requires: [deploy_start]
   required_for: [deploy_end]
   parameters: