From: Steven Hardy <shardy@redhat.com>
Date: Thu, 29 Jun 2017 16:48:46 +0000 (+0100)
Subject: Add stack_name/ctlplane_service_ips into post-upgrade.j2.yaml
X-Git-Tag: opnfv-6.0.0~457^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=19ebaad7545753f9583c6fd538b0772bceb8a972;p=apex-tripleo-heat-templates.git

Add stack_name/ctlplane_service_ips into post-upgrade.j2.yaml

Upgrades are broken because this was missed from
I36a642fbc2076ad9e4a10ffc56d6d16f3ed6f27a and
Ia619ab935c66081769e69c53d1ca41925d86abbb

Change-Id: I96590e2219df64b94dfecd91d5e25231fc7e514b
Related-Bug: #1700755
---

diff --git a/puppet/post-upgrade.j2.yaml b/puppet/post-upgrade.j2.yaml
index c51b6e1b..bdd1e613 100644
--- a/puppet/post-upgrade.j2.yaml
+++ b/puppet/post-upgrade.j2.yaml
@@ -8,17 +8,20 @@ parameters:
   servers:
     type: json
     description: Mapping of Role name e.g Controller to a list of servers
-
+  stack_name:
+    type: string
+    description: Name of the topmost stack
   role_data:
     type: json
     description: Mapping of Role name e.g Controller to the per-role data
-
   DeployIdentifier:
     default: ''
     type: string
     description: >
       Setting this to a unique value will re-run any deployment tasks which
       perform configuration on a Heat stack-update.
+  ctlplane_service_ips:
+    type: json
 
 resources:
 # Note the include here is the same as post.j2.yaml but the data used at