From 16c9036f4f77596075a7105f0e64cfae367feed4 Mon Sep 17 00:00:00 2001 From: Dan Sneddon Date: Thu, 21 Jun 2018 11:45:57 -0700 Subject: [PATCH] Fix incorrect Redis VIP declaration in fixed-ip-vips-v6.yaml This patch fixes the incorrect Redis VIP declaration in fixed-ip-vips-v6.yaml. The file incorrectly has vip.yaml for the RedisVipPort instead of vip_v6.yaml, although the fixed IP is an IPv6 address. This causes an error, and conflicts with network-isolation-v6.yaml, so the deployment works if network-isolation-v6.yaml is included after the fixed-ip-vips-v6.yaml, but fails if it is included before. Change-Id: Iffabbedfda77bc5cc4793700c459fb51b14f62d9 Closes-bug: 1778120 (cherry picked from commit 1ebf31414ebce3e88c028a34f0d9b4c8a5d5edab) --- environments/fixed-ip-vips-v6.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/fixed-ip-vips-v6.yaml b/environments/fixed-ip-vips-v6.yaml index 60c9f459cb..edcb4d8f9f 100644 --- a/environments/fixed-ip-vips-v6.yaml +++ b/environments/fixed-ip-vips-v6.yaml @@ -7,7 +7,7 @@ resource_registry: OS::TripleO::Network::Ports::InternalApiVipPort: ../network/ports/internal_api_v6.yaml OS::TripleO::Network::Ports::StorageVipPort: ../network/ports/storage_v6.yaml OS::TripleO::Network::Ports::StorageMgmtVipPort: ../network/ports/storage_mgmt_v6.yaml - OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip.yaml + OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/vip_v6.yaml parameter_defaults: # Set the IP addresses of the VIPs here.