diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-19 17:35:40 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-19 15:35:30 +0000 |
| commit | 56298a691ccef65102bbf139f9cec097230615e3 (patch) | |
| tree | d28b2c3527c560f8441b9e364c30156d8d293458 /patches | |
| parent | 652d99207dfc616e56ba19a8d9442817675581db (diff) | |
u/fuel: Bump & rebase for infinite loop removal
Change-Id: Ia3d12bceae483571e1b1c91e2d0150c12b55b73b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 05b5146d1bf7b02a72598bbd41e6b4817ab64456)
Diffstat (limited to 'patches')
4 files changed, 6 insertions, 6 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 42c7e60e..14890b0c 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 0c3ef59..d0aea74 100755 +index 25b036b..996d0a0 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 435d60ea..31036eca 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 <Alexandru.Avadanii@enea.com> 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 d0aea74..68b4f2f 100755 +index 996d0a0..d7c5e6c 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 852d9999..e826e328 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 <Alexandru.Avadanii@enea.com> 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 68b4f2f..54cd1f4 100755 +index d7c5e6c..78076f5 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 d6a214de..e1570c67 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 <Guillermo.Herrero@enea.com> 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 54cd1f4..a7ca03b 100755 +index 78076f5..955281b 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" @@ -32,14 +32,14 @@ index 54cd1f4..a7ca03b 100755 salt -C 'kvm*' state.apply linux.network salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true -@@ -42,6 +43,7 @@ while [ $rc -ne 0 ]; do +@@ -44,6 +45,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; + salt -C "$node" state.apply opnfv.adduser done sleep 5 - done + ((attempt+=1)) diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml index aa780e6..e4069c0 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml |