Merge "Redis: replace hiera CLI"

deployment/database/redis-pacemaker-puppet.yaml

@@ -214,11 +214,7 @@ outputs:
           command:
             # Note: kolla doesn't process string arguments as expected,
             # so use a bash idiom to achieve the same result
-            str_replace:
-              template:
-                bash -c $* -- eval /wait-port-and-run.sh $(hiera fqdn_$NETWORK) 6379 stunnel /etc/stunnel/stunnel.conf
-              params:
-                $NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
+            bash -c $* -- eval /wait-port-and-run.sh $(crudini --get /etc/stunnel/stunnel.conf redis accept | rev | cut -d : -f 1- | rev) 6379 stunnel /etc/stunnel/stunnel.conf
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"