From d02faff1e5c6b091c9708ef44be5b61188110d90 Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Thu, 6 Jul 2017 17:31:25 +0100
Subject: Remove controller specific bootstack_nodeid

This has been replaced for some time by bootstrap_nodeid which isn't
hard-coded to the Controller role.

Change-Id: I2c172de13646e5b88cb9930a93ca71fcc990e522
Depends-On: I0a9fced847caf344e5d26b452f1bd40afab8f029
---
 puppet/controller-role.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml
index ca08c65d..34e8c965 100644
--- a/puppet/controller-role.yaml
+++ b/puppet/controller-role.yaml
@@ -524,7 +524,6 @@ resources:
       config: {get_resource: ControllerConfig}
       server: {get_resource: Controller}
       input_values:
-        bootstack_nodeid: {get_attr: [Controller, name]}
         enable_load_balancer: {get_param: EnableLoadBalancer}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
 
@@ -567,9 +566,6 @@ resources:
               - {get_param: ControllerExtraConfig}
           extraconfig: {get_param: ExtraConfig}
           controller:
-            # data supplied directly to this deployment configuration, etc
-            bootstack_nodeid: {get_input: bootstack_nodeid}
-            # Pacemaker
             enable_load_balancer: {get_input: enable_load_balancer}
 
             # Misc
-- 
cgit 1.2.3-korg