summaryrefslogtreecommitdiffstats
path: root/puppet/services
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/services
parent95949a297574ee7e823fbeb4d8e7420432dcabe1 (diff)
Move out of roles any Ceph setting
Change-Id: I6ff0f977a1fb2fd55b29becd296ab01c65b50228
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/ceph-base.yaml16
1 files changed, 16 insertions, 0 deletions
diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml
index 415b77b6..cb011b7d 100644
--- a/puppet/services/ceph-base.yaml
+++ b/puppet/services/ceph-base.yaml
@@ -77,6 +77,22 @@ outputs:
ceph::profile::params::manage_repo: false
ceph::profile::params::authentication_type: cephx
ceph::profile::params::fsid: {get_param: CephClusterFSID}
+ # NOTE: bind IP is found in Heat replacing the network name with the local node IP
+ # for the given network; replacement examples (eg. for internal_api):
+ # internal_api -> IP
+ # internal_api_uri -> [IP]
+ # internal_api_subnet - > IP/CIDR
+ ceph::profile::params::cluster_network:
+ str_replace:
+ template: "NETWORK_subnet"
+ params:
+ NETWORK: {get_param: [ServiceNetMap, CephClusterNetwork]}
+ ceph::profile::params::public_network:
+ str_replace:
+ template: "NETWORK_subnet"
+ params:
+ NETWORK: {get_param: [ServiceNetMap, CephPublicNetwork]}
+ ceph::profile::params::public_addr: {get_param: [ServiceNetMap, CephPublicNetwork]}
ceph::profile::params::client_keys:
str_replace:
template: "{