From ada9bc36732649e34721e64a4a92de54fd4d8842 Mon Sep 17 00:00:00 2001 From: yatin Date: Mon, 16 Apr 2018 08:12:48 +0530 Subject: [PATCH] Use hiera interpolation for memcached_network After [1] iptables rules are not set for memcached service thus services relying on memcached were not functioning well. With [2] it's requrired to use hiera interpolation for service configs, this patch fixes it for memcached_network. [1] https://review.openstack.org/#/c/551292 [2] https://review.openstack.org/#/c/526692 Related-Bug: #1757556 Closes-Bug: #1763009 Change-Id: If9b274192ea4738f455a6106ff1a62eb4e7a5c91 (cherry picked from commit d3d27d7ea84fe01320dee3e4fa2e2fad11640eb7) --- puppet/services/memcached.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/puppet/services/memcached.yaml b/puppet/services/memcached.yaml index 01622e0820..0877bb88c5 100644 --- a/puppet/services/memcached.yaml +++ b/puppet/services/memcached.yaml @@ -73,10 +73,11 @@ outputs: config_settings: memcached_network: str_replace: - template: "NETWORK_subnet" + template: + "%{hiera('$NETWORK_subnet')}" params: - NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]} - # NOTE: bind IP is found in Heat replacing the network name with the local node IP + $NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]} + # NOTE: bind IP is found in hiera 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]