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/compute.yaml | |
| parent | 8794610ceea3ae9537c302be595361f3bdad642a (diff) | |
| parent | cf5fd01b0868eb678ab092d8104dd6db50d3a1c7 (diff) | |
Merge "Remove static hieradata"
Diffstat (limited to 'puppet/compute.yaml')
| -rw-r--r-- | puppet/compute.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 0f40634e..dcb3c39a 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -368,7 +368,6 @@ resources: - service_configs - compute - ceph_cluster # provided by CephClusterConfig - - ceph - all_nodes # provided by allNodesConfig - '"%{::osfamily}"' - network @@ -393,10 +392,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} |