From: Jiri Stransky <jistr@redhat.com>
Date: Wed, 28 Jun 2017 08:44:01 +0000 (+0200)
Subject: Add ctlplane_service_ips param to upgrade steps
X-Git-Tag: opnfv-6.0.0~467
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9ac589295f199133df8192d67cfe10f011ef08dd;p=apex-tripleo-heat-templates.git

Add ctlplane_service_ips param to upgrade steps

Upgrades were broken because of this missing parameter.

Change-Id: Ia88a9833ab8aa26ccc40ee235b8554c9a7fbd22d
Closes-Bug: #1700923
---

diff --git a/puppet/major_upgrade_steps.j2.yaml b/puppet/major_upgrade_steps.j2.yaml
index b9e0860e..574c41b0 100644
--- a/puppet/major_upgrade_steps.j2.yaml
+++ b/puppet/major_upgrade_steps.j2.yaml
@@ -14,7 +14,8 @@ parameters:
   role_data:
     type: json
     description: Mapping of Role name e.g Controller to the per-role data
-
+  ctlplane_service_ips:
+    type: json
   UpdateIdentifier:
     type: string
     description: >
@@ -210,6 +211,7 @@ resources:
       servers: {get_param: servers}
       stack_name: {get_param: stack_name}
       role_data: {get_param: role_data}
+      ctlplane_service_ips: {get_param: ctlplane_service_ips}
 
 outputs:
   # Output the config for each role, just use Step1 as the config should be