From cf5fd01b0868eb678ab092d8104dd6db50d3a1c7 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 4 Aug 2016 16:10:40 -0400 Subject: Remove static hieradata Static hieradata moved to composable services, we don't need the files anymore. It also cleanup how we construct Hieradata configuration by removing unused hiera files. Change-Id: I19f85b6c1b734473cf908ddaca29ad966f9f5405 --- puppet/compute.yaml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'puppet/compute.yaml') diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 1ae55cd3..0b2f5900 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -367,7 +367,6 @@ resources: - service_configs - compute - ceph_cluster # provided by CephClusterConfig - - ceph - all_nodes # provided by allNodesConfig - '"%{::osfamily}"' - network @@ -392,10 +391,7 @@ resources: net_ip_map: {get_attr: [NetIpMap, net_ip_map]} net_ip_subnet_map: {get_attr: [NetIpMap, net_ip_subnet_map]} net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]} - ceph: - raw_data: {get_file: hieradata/ceph.yaml} compute: - raw_data: {get_file: hieradata/compute.yaml} mapped_data: cinder_enable_nfs_backend: {get_input: cinder_enable_nfs_backend} nova::use_ipv6: {get_input: nova_ipv6} -- cgit 1.2.3-korg