diff options
author | Emilien Macchi <emilien@redhat.com> | 2016-08-04 16:10:40 -0400 |
---|---|---|
committer | Emilien Macchi <emilien@redhat.com> | 2016-08-08 11:30:12 -0400 |
commit | cf5fd01b0868eb678ab092d8104dd6db50d3a1c7 (patch) | |
tree | 47e2034a0f1a8138dbab5e7097167a237034e390 /puppet/controller.yaml | |
parent | db229cd82c86bcadc5cd5290f3a2e107770d0bf1 (diff) |
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
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r-- | puppet/controller.yaml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 93ba4760..3d2cdc7e 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -618,7 +618,6 @@ resources: - service_configs - service_names - controller - - object - swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig - ceph_cluster # provided by CephClusterConfig - ceph @@ -654,15 +653,11 @@ resources: 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} mapped_data: ceph::profile::params::cluster_network: {get_input: ceph_cluster_network} ceph::profile::params::public_network: {get_input: ceph_public_network} ceph::profile::params::public_addr: {get_input: ceph_public_ip} - object: - raw_data: {get_file: hieradata/object.yaml} controller: - raw_data: {get_file: hieradata/controller.yaml} mapped_data: # data supplied directly to this deployment configuration, etc bootstack_nodeid: {get_input: bootstack_nodeid} |