openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove controller specific bootstack_nodeid"

Browse Source
This commit is contained in:
Jenkins 2017-07-12 19:39:13 +00:00 committed by Gerrit Code Review
commit 42af8a51d1
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/controller-role.yaml
View File

@ -524,7 +524,6 @@ resources:
config: {get_resource: ControllerConfig} config: {get_resource: ControllerConfig}
server: {get_resource: Controller} server: {get_resource: Controller}
input_values: input_values:
bootstack_nodeid: {get_attr: [Controller, name]}
enable_load_balancer: {get_param: EnableLoadBalancer} enable_load_balancer: {get_param: EnableLoadBalancer}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
@ -567,9 +566,6 @@ resources:
- {get_param: ControllerExtraConfig} - {get_param: ControllerExtraConfig}
extraconfig: {get_param: ExtraConfig} extraconfig: {get_param: ExtraConfig}
controller: controller:
# data supplied directly to this deployment configuration, etc
bootstack_nodeid: {get_input: bootstack_nodeid}
# Pacemaker
enable_load_balancer: {get_input: enable_load_balancer} enable_load_balancer: {get_input: enable_load_balancer}
# Misc # Misc