Merge "Move out of roles any Ceph setting"

1 files changed, 16 insertions, 0 deletions

diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml
index a4b1653a..4d98546d 100644
--- a/puppet/services/ceph-base.yaml
+++ b/puppet/services/ceph-base.yaml
@@ -79,6 +79,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: "{