From 87f1f7d26abbc65f3095faa28b9e1f62d96ff0ee Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Tue, 6 Sep 2016 11:45:28 +0100 Subject: Add bootstrap_node and vip_data to hierarchy for all roles 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 --- puppet/ceph-storage.yaml | 2 ++ puppet/cinder-storage.yaml | 2 ++ puppet/compute.yaml | 2 ++ puppet/controller.yaml | 2 +- puppet/swift-storage.yaml | 2 ++ 5 files changed, 9 insertions(+), 1 deletion(-) (limited to 'puppet') diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index fe2a916f..5ba2c298 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -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: diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index bc26df75..699a0969 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -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: diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 0f9e0313..e74d1a54 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -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 diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 14848f97..1656aea7 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -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}"' diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml index a5bb1403..d8e49cac 100644 --- a/puppet/swift-storage.yaml +++ b/puppet/swift-storage.yaml @@ -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: -- cgit 1.2.3-korg