Use separate tasks for cluster configuration

Switch to using separate cluster tasks in order to avoid loops in
task graph.

Related library patch: I1392d74982643a5639c7a087298e8247a0a91b34
Partial-bug: #1590329

Change-Id: I29e89dbfac4ce5092bd428dcda3f09f8849b54af

deployment_tasks.yaml

@@ -5,10 +5,9 @@
   role: [primary-standalone-database]
   requires: [deploy_start]
   required_for: [deploy_end]
-  tasks: [hiera, fuel_pkgs, globals, tools, logging, netconfig,
-    hosts, firewall, database-firewall, deploy_start, primary-cluster,
-    database-virtual-ip, primary-cluster-haproxy, openstack-haproxy-stats,
-    primary-database]
+  tasks: [hiera, fuel_pkgs, globals, tools, logging, netconfig, hiera_default_route,
+    hosts, firewall, database-firewall, deploy_start, primary-database,
+    database-virtual-ip, primary-cluster-haproxy, openstack-haproxy-stats]
   parameters:
     strategy:
       type: one_by_one
@@ -18,9 +17,9 @@
   role: [standalone-database]
   requires: [deploy_start, primary-standalone-database, primary-controller, controller]
   required_for: [deploy_end]
-  tasks: [hiera, fuel_pkgs, globals, tools, logging, netconfig,
-    hosts, firewall, database-firewall, deploy_start, cluster,
-    database-virtual-ip, cluster-haproxy, openstack-haproxy-stats, database]
+  tasks: [hiera, fuel_pkgs, globals, tools, logging, netconfig, hiera_default_route,
+    hosts, firewall, database-firewall, deploy_start, database-virtual-ip,
+    cluster-haproxy, openstack-haproxy-stats, database]
   parameters:
     strategy:
       type: parallel
@@ -42,13 +41,12 @@
   version: 2.0.0
   role: [primary-standalone-database, standalone-database]
   requires: [globals, firewall]
-  required_for: [primary-cluster, cluster, primary-database, database]
+  required_for: [primary-database-cluster, database-cluster, primary-database, database]
   parameters:
     puppet_manifest: "database_firewall.pp"
     puppet_modules: "/etc/puppet/modules"
     timeout: 120
 
-
 - id: database-haproxy
   type: puppet
   version: 2.0.0
@@ -66,8 +64,33 @@
   version: 2.0.0
   role: [primary-standalone-database, standalone-database]
   required_for: [primary-database, database, deploy_end]
-  requires: [database-firewall, primary-cluster, cluster]
+  requires: [database-firewall, primary-database-cluster, database-cluster]
   parameters:
     puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/virtual_ips/virtual_ips.pp"
     puppet_modules: "/etc/puppet/modules"
     timeout: 3600
+
+- id: primary-database-cluster
+  type: puppet
+  version: 2.0.0
+  groups: [primary-standalone-database]
+  required_for: [deploy_end, primary-cluster-haproxy]
+  requires: [hosts, firewall, deploy_start]
+  parameters:
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster/cluster.pp"
+    puppet_modules: "/etc/puppet/modules"
+    timeout: 300
+
+- id: database-cluster
+  type: puppet
+  version: 2.0.0
+  groups: [standalone-database]
+  cross-depends:
+    - name: primary-database-cluster
+      role: primary-standalone-database
+  required_for: [deploy_end, cluster-haproxy]
+  requires: [hosts, firewall, deploy_start]
+  parameters:
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/cluster/cluster.pp"
+    puppet_modules: "/etc/puppet/modules"
+    timeout: 300