Browse Source

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
tags/1.0rc1
Simon Pasquier 3 years ago
parent
commit
e0130a81d5
1 changed files with 21 additions and 4 deletions
  1. 21
    4
      deployment_tasks.yaml

+ 21
- 4
deployment_tasks.yaml View File

@@ -11,7 +11,7 @@
11 11
     - globals
12 12
     - tools
13 13
     - logging
14
-    - netconfig
14
+    - elasticsearch-netconfig
15 15
     - hosts
16 16
     - elasticsearch-check-configuration
17 17
     - elasticsearch-hiera
@@ -38,7 +38,7 @@
38 38
     - globals
39 39
     - tools
40 40
     - logging
41
-    - netconfig
41
+    - elasticsearch-netconfig
42 42
     - hosts
43 43
     - elasticsearch-check-configuration
44 44
     - elasticsearch-hiera
@@ -62,7 +62,7 @@
62 62
 - id: elasticsearch-hiera
63 63
   type: puppet
64 64
   version: 2.0.0
65
-  requires: [netconfig]
65
+  requires: [globals]
66 66
   required_for: [deploy_end]
67 67
   parameters:
68 68
     puppet_manifest: "puppet/manifests/hiera_override.pp"
@@ -85,10 +85,27 @@
85 85
   reexecute_on:
86 86
     - deploy_changes
87 87
 
88
+# We cannot use the legacy 'netconfig' task because it won't create the proper
89
+# dependency on the virtual management router task.
90
+- id: elasticsearch-netconfig
91
+  type: puppet
92
+  version: 2.0.0
93
+  requires: [elasticsearch-check-configuration, virtual_ips]
94
+  required_for: [deploy_end, hosts]
95
+  cross-depends:
96
+    - name: virtual_ips
97
+      role: [primary-controller, controller]
98
+  parameters:
99
+    puppet_manifest: "/etc/puppet/modules/osnailyfacter/modular/netconfig/netconfig.pp"
100
+    puppet_modules: /etc/puppet/modules
101
+    timeout: 600
102
+  reexecute_on:
103
+    - deploy_changes
104
+
88 105
 - id: elasticsearch-firewall
89 106
   type: puppet
90 107
   version: 2.0.0
91
-  requires: [elasticsearch-check-configuration]
108
+  requires: [elasticsearch-netconfig]
92 109
   required_for: [deploy_end]
93 110
   parameters:
94 111
     puppet_manifest: "puppet/manifests/firewall.pp"

Loading…
Cancel
Save