From e7ea434b3278d1fdaa8cd26f22d53c735d53b9ac Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 12 Sep 2017 00:01:58 +0200 Subject: u/fuel: Bump & rebase for mcpcontrol CIDR change Stop overriding MaaS IP in mcpcontrol, keep same value as Fuel@OPNFV has (10.20.0.3). Change-Id: I4789aef378204fdbcf53355c62a9a289b200987c Signed-off-by: Alexandru Avadanii --- .../opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch') diff --git a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch index 086fa62d..ab155b52 100644 --- a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch +++ b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch @@ -63,7 +63,7 @@ index 505153a..bd6e923 100755 + --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.200 \ --network floating_net --subnet-range ${PUBLIC_NET} floating_subnet" diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml -index d60c81d..f31624e 100644 +index 0e3a264..82fa25f 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml @@ -53,13 +53,13 @@ parameters: -- cgit 1.2.3-korg