openstack/tripleo-heat-templates
Code Issues Proposed changes

Add bootstrap_node and vip_data to hierarchy for all roles

Browse Source 
We recently made changes that add data to allNodesConfig, but
we didn't wire the files into the hierarchy on all roles.

Change-Id: I8e838b02bd982e600af54b14350106322244890a
Closes-Bug: #1620485
This commit is contained in:
Steven Hardy 2016-09-06 11:45:28 +01:00 committed by Emilien Macchi
parent 6725d14e8a
commit 87f1f7d26a
5 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/ceph-storage.yaml
View File

@ -248,7 +248,9 @@ resources:
- extraconfig
- service_names
- service_configs
- bootstrap_node # provided by allNodesConfig
- all_nodes # provided by allNodesConfig
- vip_data # provided by allNodesConfig
- '"%{::osfamily}"'
merge_behavior: deeper
datafiles:

2
puppet/cinder-storage.yaml
View File

@ -244,7 +244,9 @@ resources:
- service_names
- service_configs
- volume
- bootstrap_node # provided by allNodesConfig
- all_nodes # provided by allNodesConfig
- vip_data # provided by allNodesConfig
- '"%{::osfamily}"'
merge_behavior: deeper
datafiles:

2
puppet/compute.yaml
View File

@ -261,7 +261,9 @@ resources:
- service_names
- service_configs
- compute
- bootstrap_node # provided by allNodesConfig
- all_nodes # provided by allNodesConfig
- vip_data # provided by allNodesConfig
- '"%{::osfamily}"'
- neutron_bigswitch_data # Optionally provided by ComputeExtraConfigPre
- cisco_n1kv_data # Optionally provided by ComputeExtraConfigPre

2
puppet/controller.yaml
View File

@ -314,7 +314,7 @@ resources:
- service_names
- controller
- swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
- bootstrap_node # provided by BootstrapNodeConfig
- bootstrap_node # provided by allNodesConfig
- all_nodes # provided by allNodesConfig
- vip_data # provided by allNodesConfig
- '"%{::osfamily}"'

2
puppet/swift-storage.yaml
View File

@ -238,7 +238,9 @@ resources:
- service_configs
- object
- swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
- bootstrap_node # provided by allNodesConfig
- all_nodes # provided by allNodesConfig
- vip_data # provided by allNodesConfig
- '"%{::osfamily}"'
merge_behavior: deeper
datafiles: