Fix task dependencies of tasks for separated services

Updates for memcache and rabbitmq:
None of these tasks require haproxy, but they all require
netconfig. RabbitMQ will not work until cluster task is
done (providing corosync). This enables plugins to use
these tasks without breaking the deployment graph.

Updates for glance and openstack-network:
These tasks require rabbitmq, but not explicitly.
Now they depend on rabbitmq as a cross dependency.

Change-Id: I5e835a448ad0d77f0f82630273e15c00261cfb82
Partial-Bug: #1553239

deployment/puppet/openstack_tasks/examples/glance/tasks.yaml

@@ -7,6 +7,7 @@
   cross-depends:
     - name: glance-db
     - name: glance-keystone
+    - name: /(primary-)?rabbitmq/
   parameters:
     puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/glance/glance.pp
     puppet_modules: /etc/puppet/modules

deployment/puppet/openstack_tasks/examples/openstack-network/tasks.yaml

@@ -35,6 +35,7 @@
     - name: neutron-keystone
     - name: openstack-haproxy
     - name: neutron-db
+    - name: (primary-)?rabbitmq
 
 - id: openstack-network-common-config
   type: puppet

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

@@ -3,7 +3,7 @@
   version: 2.0.0
   groups: [primary-controller, controller]
   required_for: [keystone, primary-keystone]
-  requires: [openstack-haproxy]
+  requires: [netconfig]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/apache/apache.pp
     puppet_modules: /etc/puppet/modules

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

@@ -3,7 +3,7 @@
   version: 2.0.0
   groups: [primary-controller, controller]
   required_for: [deploy_end, keystone, primary-keystone]
-  requires: [openstack-haproxy]
+  requires: [netconfig]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/memcached/memcached.pp
     puppet_modules: /etc/puppet/modules

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

@@ -5,7 +5,7 @@
   cross-depends:
     - name: primary-rabbitmq
   required_for: [deploy_end, openstack-controller, primary-openstack-controller, glance]
-  requires: [openstack-haproxy]
+  requires: [netconfig, cluster]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/rabbitmq/rabbitmq.pp
     puppet_modules: /etc/puppet/modules
@@ -17,7 +17,7 @@
   version: 2.0.0
   groups: [primary-controller]
   required_for: [deploy_end, openstack-controller, primary-openstack-controller, glance]
-  requires: [openstack-haproxy]
+  requires: [netconfig, primary-cluster]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/rabbitmq/rabbitmq.pp
     puppet_modules: /etc/puppet/modules