summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Pasquier <spasquier@mirantis.com>2016-08-01 14:32:21 +0200
committerSimon Pasquier <spasquier@mirantis.com>2016-08-01 16:25:44 +0200
commite0130a81d5886b36ce042559cb8d2a1684d04df8 (patch)
tree475c852f120d14f2a9845f00cf0c79a44749ba31
parent9518c68d6ddcf98c05e9cac53232b68db9239e73 (diff)
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
Notes
Notes (review): Code-Review+2: Swann Croiset <scroiset@mirantis.com> Workflow+1: Simon Pasquier <spasquier@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 04 Aug 2016 15:02:11 +0000 Reviewed-on: https://review.openstack.org/349487 Project: openstack/fuel-plugin-elasticsearch-kibana Branch: refs/heads/master
-rw-r--r--deployment_tasks.yaml25
1 files 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 @@
11 - globals 11 - globals
12 - tools 12 - tools
13 - logging 13 - logging
14 - netconfig 14 - elasticsearch-netconfig
15 - hosts 15 - hosts
16 - elasticsearch-check-configuration 16 - elasticsearch-check-configuration
17 - elasticsearch-hiera 17 - elasticsearch-hiera
@@ -38,7 +38,7 @@
38 - globals 38 - globals
39 - tools 39 - tools
40 - logging 40 - logging
41 - netconfig 41 - elasticsearch-netconfig
42 - hosts 42 - hosts
43 - elasticsearch-check-configuration 43 - elasticsearch-check-configuration
44 - elasticsearch-hiera 44 - elasticsearch-hiera
@@ -62,7 +62,7 @@
62- id: elasticsearch-hiera 62- id: elasticsearch-hiera
63 type: puppet 63 type: puppet
64 version: 2.0.0 64 version: 2.0.0
65 requires: [netconfig] 65 requires: [globals]
66 required_for: [deploy_end] 66 required_for: [deploy_end]
67 parameters: 67 parameters:
68 puppet_manifest: "puppet/manifests/hiera_override.pp" 68 puppet_manifest: "puppet/manifests/hiera_override.pp"
@@ -85,10 +85,27 @@
85 reexecute_on: 85 reexecute_on:
86 - deploy_changes 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- id: elasticsearch-firewall 105- id: elasticsearch-firewall
89 type: puppet 106 type: puppet
90 version: 2.0.0 107 version: 2.0.0
91 requires: [elasticsearch-check-configuration] 108 requires: [elasticsearch-netconfig]
92 required_for: [deploy_end] 109 required_for: [deploy_end]
93 parameters: 110 parameters:
94 puppet_manifest: "puppet/manifests/firewall.pp" 111 puppet_manifest: "puppet/manifests/firewall.pp"