From 3acf7e4cfd9f2642f1980681559bbecc2b250eab Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Fri, 16 Mar 2018 15:41:21 +0100
Subject: [PATCH] Remove hiera interpolation from ceph-ansible parameters

We can't interpolate hiera parameters when setting values
for the ceph-ansible parameters.

Change-Id: I647497a593acd8628a2b0f439d8b5380ba8705aa
---
 docker/services/ceph-ansible/ceph-base.yaml | 10 +---------
 docker/services/ceph-ansible/ceph-rgw.yaml  | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index 436faf21f6..bddb646954 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -231,15 +231,7 @@ outputs:
           ceph_docker_image_tag: {get_attr: [DockerImageUrlParts, value, image_tag]}
           containerized_deployment: true
           public_network: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephMonNetwork]}]}
-          monitor_address_block:
-            get_param:
-              - ServiceData
-              - net_cidr_map
-              - str_replace:
-                  template:
-                    "%{hiera('$NETWORK')}"
-                  params:
-                    $NETWORK: {get_param: [ServiceNetMap, CephMonNetwork]}
+          monitor_address_block: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephMonNetwork]}]}
           cluster_network: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
           user_config: true
           ceph_stable: true
diff --git a/docker/services/ceph-ansible/ceph-rgw.yaml b/docker/services/ceph-ansible/ceph-rgw.yaml
index 9d9d04ba94..5bbee3e0b0 100644
--- a/docker/services/ceph-ansible/ceph-rgw.yaml
+++ b/docker/services/ceph-ansible/ceph-rgw.yaml
@@ -72,15 +72,7 @@ outputs:
             - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
             - radosgw_keystone: true
               radosgw_keystone_ssl: false
-              radosgw_address_block:
-                get_param:
-                  - ServiceData
-                  - net_cidr_map
-                  - str_replace:
-                      template:
-                        "%{hiera('$NETWORK')}"
-                      params:
-                        $NETWORK: {get_param: [ServiceNetMap, CephRgwNetwork]}
+              radosgw_address_block: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephRgwNetwork]}]}
               radosgw_civetweb_port: {get_param: [EndpointMap, CephRgwInternal, port]}
       service_config_settings:
         keystone: