From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 25 Aug 2016 02:47:09 +0000 (+0000)
Subject: Merge "Allow a fixed IP to be allocated to RedisVirtualIP"
X-Git-Tag: opnfv-6.0.0~1725
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6d12839f3655f8774ad227bfa4f3cf4d7b45acc5;p=apex-tripleo-heat-templates.git

Merge "Allow a fixed IP to be allocated to RedisVirtualIP"
---

6d12839f3655f8774ad227bfa4f3cf4d7b45acc5
diff --cc overcloud.yaml
index b88d1dcd,de24874e..b37426f8
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@@ -643,8 -797,9 +649,9 @@@ resources
        ControlPlaneIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
        ControlPlaneNetwork: {get_param: NeutronControlPlaneID}
        PortName: redis_virtual_ip
 -      NetworkName: {get_param: [ServiceNetMap, RedisNetwork]}
 +      NetworkName: {get_attr: [ServiceNetMap, service_net_map, RedisNetwork]}
        ServiceName: redis
+       FixedIPs: {get_param: RedisVirtualFixedIPs}
  
    # The public VIP is on the External net, falls back to ctlplane
    PublicVirtualIP: