summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-12 19:39:13 +0000
committerGerrit Code Review <review@openstack.org>2017-07-12 19:39:13 +0000
commit42af8a51d1fe1781c1535a6c956bd441908a66e3 (patch)
treecc37ae6c3b30d67f15acb5e0d88f81e2e69e6530 /puppet
parentf236656a5a666d084274f11cb334c3a81cf21491 (diff)
parentd02faff1e5c6b091c9708ef44be5b61188110d90 (diff)
Merge "Remove controller specific bootstack_nodeid"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller-role.yaml4
1 files changed, 0 insertions, 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