From 26be4fb77af34a001f01d0f3a01bbf8bf6040877 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 29 Aug 2017 20:11:31 +0200 Subject: p/fuel: Rebase after wrap of common virtual config Change-Id: I1fd6e63385cfa158b35fa544e1cbb65b6d858c34 Signed-off-by: Alexandru Avadanii --- .../opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch') diff --git a/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch index 27690dfd..04704169 100644 --- a/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch +++ b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch @@ -41,7 +41,7 @@ index 2dd62f9..3731c31 100755 wait_for 10 "salt -C 'mas01*' state.apply maas.region" diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml -index 066a6e2..eae7586 100644 +index c5a999b..79a8e92 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml @@ -16,19 +16,19 @@ parameters: @@ -170,7 +170,7 @@ index e49a205..ad99447 100644 opendaylight_server_node01_hostname: odl01 opendaylight_router: odl-router_v2 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml -index acf2b43..57fb461 100644 +index 23f205f..d09c643 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml @@ -16,19 +16,19 @@ parameters: -- cgit 1.2.3-korg