diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-19 05:49:46 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-19 03:49:57 +0000 |
| commit | 652d99207dfc616e56ba19a8d9442817675581db (patch) | |
| tree | 7234b608c8d255e17c77723980c935fa38c7172e /patches/opnfv-fuel/0014-Add-opnfv-user-to-the-deployment.patch | |
| parent | a8ba1facc345bc6af997671933a7efc40a715608 (diff) | |
u/fuel: Bump & rebase for cmp network fix
Change-Id: I2d445a78ee6d25b826afe3c42d433b9c4af3d09d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit cdff247b728bd6d00ce7ed7f6994fd0688304fc1)
Diffstat (limited to 'patches/opnfv-fuel/0014-Add-opnfv-user-to-the-deployment.patch')
| -rw-r--r-- | patches/opnfv-fuel/0014-Add-opnfv-user-to-the-deployment.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 52d2b4d9..d6a214de 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 75386a7..083dd32 100755 +index 54cd1f4..a7ca03b 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" @@ -31,8 +31,8 @@ index 75386a7..083dd32 100755 +salt -C '*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network 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 + salt -C 'cmp*' state.apply linux.network || true +@@ -42,6 +43,7 @@ while [ $rc -ne 0 ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; |