From e0130a81d5886b36ce042559cb8d2a1684d04df8 Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquier@mirantis.com>
Date: Mon, 1 Aug 2016 14:32:21 +0200
Subject: [PATCH] Configure the network once the vrouter is up

This change makes sure that the virtual router on the management
network is up and running before configuring the network.

Change-Id: I30063d09d1f7f4e8c5b75beb4d901e174a76f7f1
Closes-Bug: #1583994
---
 deployment_tasks.yaml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 3c64554..b5b292a 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -11,7 +11,7 @@
     - globals
     - tools
     - logging
-    - netconfig
+    - elasticsearch-netconfig
     - hosts
     - elasticsearch-check-configuration
     - elasticsearch-hiera
@@ -38,7 +38,7 @@
     - globals
     - tools
     - logging
-    - netconfig
+    - elasticsearch-netconfig
     - hosts
     - elasticsearch-check-configuration
     - elasticsearch-hiera
@@ -62,7 +62,7 @@
 - id: elasticsearch-hiera
   type: puppet
   version: 2.0.0
-  requires: [netconfig]
+  requires: [globals]
   required_for: [deploy_end]
   parameters:
     puppet_manifest: "puppet/manifests/hiera_override.pp"
@@ -85,10 +85,27 @@
   reexecute_on:
     - deploy_changes
 
+# We cannot use the legacy 'netconfig' task because it won't create the proper
+# dependency on the virtual management router task.
+- id: elasticsearch-netconfig
+  type: puppet
+  version: 2.0.0
+  requires: [elasticsearch-check-configuration, virtual_ips]
+  required_for: [deploy_end, hosts]
+  cross-depends:
+    - name: virtual_ips
+      role: [primary-controller, controller]
+  parameters:
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/netconfig/netconfig.pp"
+    puppet_modules: /etc/puppet/modules
+    timeout: 600
+  reexecute_on:
+    - deploy_changes
+
 - id: elasticsearch-firewall
   type: puppet
   version: 2.0.0
-  requires: [elasticsearch-check-configuration]
+  requires: [elasticsearch-netconfig]
   required_for: [deploy_end]
   parameters:
     puppet_manifest: "puppet/manifests/firewall.pp"