diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-09 12:39:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-09 12:39:18 +0000 |
| commit | 173ce97b0c404e0dd815b299080fbdc89b680bc9 (patch) | |
| tree | d7e295c6b52523c828897c662c5c8b514fb3456e /puppet/controller.yaml | |
| parent | 8794610ceea3ae9537c302be595361f3bdad642a (diff) | |
| parent | cf5fd01b0868eb678ab092d8104dd6db50d3a1c7 (diff) | |
Merge "Remove static hieradata"
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 a1cc725e..93f0e03e 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -604,7 +604,6 @@ resources: - service_configs - service_names - controller - - object - swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig - ceph_cluster # provided by CephClusterConfig - ceph @@ -640,15 +639,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} |