From 6ed719d4587fa9e0d0a9dc2c85b81ac2a5d7e6e6 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 20 Oct 2017 00:36:11 +0200 Subject: u/fuel: Bump & rebase for VCP VM timeout increase Change-Id: I12f65038f2617fef4a5a12675a364ef113188b52 Signed-off-by: Alexandru Avadanii --- .../opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch | 2 +- .../0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 2 +- .../opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch | 2 +- patches/opnfv-fuel/0014-Add-opnfv-user-to-the-deployment.patch | 2 +- upstream/fuel | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch index 14890b0c..9c8e1076 100644 --- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch @@ -70,7 +70,7 @@ index aada4ad..afd6c53 100755 salt -I 'mongodb:server' state.sls mongodb wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 25b036b..996d0a0 100755 +index 0650869..7611c12 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -23,6 +23,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 31036eca..d5a218a5 100644 --- a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -29,7 +29,7 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 996d0a0..d7c5e6c 100755 +index 7611c12..6d63838 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -24,6 +24,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ diff --git a/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch index e826e328..8ba183f4 100644 --- a/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch +++ b/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch @@ -32,7 +32,7 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index d7c5e6c..78076f5 100755 +index 6d63838..a5fc061 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -17,6 +17,7 @@ salt -C 'kvm*' pkg.install bridge-utils diff --git a/patches/opnfv-fuel/0014-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0014-Add-opnfv-user-to-the-deployment.patch index e1570c67..75e239a0 100644 --- a/patches/opnfv-fuel/0014-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0014-Add-opnfv-user-to-the-deployment.patch @@ -21,7 +21,7 @@ Signed-off-by: Guillermo Herrero create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 78076f5..955281b 100755 +index a5fc061..b2d005b 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -14,6 +14,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" diff --git a/upstream/fuel b/upstream/fuel index 2776ab9d..4b63bd0e 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 2776ab9d850e764a92c30c858befc48e474f6dd4 +Subproject commit 4b63bd0ea961d06723b277b874168c2aaddb96c5 -- cgit 1.2.3-korg