diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-23 19:16:30 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-23 18:35:18 +0000 |
| commit | 1d42906057483865e5e8344fc186ea6299c7daf4 (patch) | |
| tree | 7e78a7753ff933797fc2f8d510c71275bc713bde /patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch | |
| parent | 9b542ee2202c702445128e019b2454960d828651 (diff) | |
u/fuel: Bump & rebase for MaaS fabrics fix
Change-Id: I58bacd2b8f9d210fd9e144cd8db6239ca0b8949d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 812d2f0ef3b7f638a29f10770007ef249d609c2c)
Diffstat (limited to 'patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch')
| -rw-r--r-- | patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch index 16d58cbc..7c58ec3d 100644 --- a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch @@ -21,10 +21,10 @@ 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 44d7c6d..8fc03d4 100755 +index 1657d3c..4b3ec42 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -22,6 +22,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ +@@ -37,6 +37,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ repl="\n if not __salt__['pkg.version']('vlan'):\n __salt__['pkg.install']('vlan')" salt -C 'kvm*' pkg.install bridge-utils @@ -32,7 +32,7 @@ index 44d7c6d..8fc03d4 100755 salt -C 'kvm*' state.apply linux.network salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true -@@ -52,6 +53,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do +@@ -67,6 +68,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; }; |