diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-17 16:06:14 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-18 16:24:43 +0000 |
| commit | 773b4745ade96e65f3b9e9707d6ea8b861dd5554 (patch) | |
| tree | 002fb62791e4b048670fcf96f073c142abe60158 /patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch | |
| parent | 9c944c3aaf78360f47a8bf845c1dda0079fa3fc4 (diff) | |
u/fuel: Bump & rebase for state break & retry
While at it, return true for all armband states that apply patches
which are also providing a post-patching file hash.
Change-Id: I303a2e142a8a9925f6630b53891ddc7bb0399453
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit e68b725920bd313df0ca65a77b27c8de6a6e2937)
Diffstat (limited to 'patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch')
| -rw-r--r-- | patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch index bfcaba12..52d2b4d9 100644 --- a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch @@ -21,18 +21,18 @@ 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 899972c..1ea14b1 100755 +index 75386a7..083dd32 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -12,6 +12,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" +@@ -14,6 +14,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" # KVM, compute node prereqs (libvirt first), VCP deployment salt -C 'kvm*' pkg.install bridge-utils +salt -C '*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network - salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 - salt -C 'kvm*' system.reboot -@@ -36,6 +37,7 @@ while [ $rc -ne 0 ]; do + salt -C 'cmp*' state.apply linux.system + salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 || true +@@ -41,6 +42,7 @@ while [ $rc -ne 0 ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; |