aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-08-17 20:18:38 +0200
committerGiulio Fidente <gfidente@redhat.com>2016-08-24 12:51:15 +0200
commitd90363bd58314c0ae3c166a70d4d1c89391f9386 (patch)
treed526085cd26febfcd8487a37f9a44991897e8807 /puppet/controller.yaml
parent95949a297574ee7e823fbeb4d8e7420432dcabe1 (diff)
Move out of roles any Ceph setting
Change-Id: I6ff0f977a1fb2fd55b29becd296ab01c65b50228
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml24
1 files changed, 0 insertions, 24 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 65e47b77..8925d2e6 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -494,23 +494,6 @@ resources:
redis_vip: {get_param: RedisVirtualIP}
sahara_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SaharaApiNetwork]}]}
memcached_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
- ceph_cluster_network:
- get_attr:
- - NetIpMap
- - net_ip_map
- - str_replace:
- template: "NETWORK_subnet"
- params:
- NETWORK: {get_param: [ServiceNetMap, CephClusterNetwork]}
- ceph_public_network:
- get_attr:
- - NetIpMap
- - net_ip_map
- - str_replace:
- template: "NETWORK_subnet"
- params:
- NETWORK: {get_param: [ServiceNetMap, CephPublicNetwork]}
- ceph_public_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
ironic_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, IronicApiNetwork]}]}
# Map heat metadata into hiera datafiles
@@ -529,8 +512,6 @@ resources:
- service_names
- controller
- swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
- - ceph_cluster # provided by CephClusterConfig
- - ceph
- bootstrap_node # provided by BootstrapNodeConfig
- all_nodes # provided by allNodesConfig
- vip_data # provided by vip-config
@@ -559,11 +540,6 @@ resources:
- {get_param: ControllerExtraConfig}
extraconfig:
mapped_data: {get_param: ExtraConfig}
- ceph:
- 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}
controller:
mapped_data: # data supplied directly to this deployment configuration, etc
bootstack_nodeid: {get_input: bootstack_nodeid}