diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index fe2a916f9e..5ba2c298e6 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 bc26df7549..699a096983 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 0f9e0313b4..e74d1a54c7 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 14848f9759..1656aea767 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 a5bb1403ee..d8e49caced 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: