diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-03 18:20:17 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-03 19:58:31 +0000 |
| commit | cbd85660a376264b5fc3bde17e4d7c9dfbbd53d3 (patch) | |
| tree | b152dcbfec91f14cd8b9ba5854b77083d314d798 /patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch | |
| parent | d79947a082dd7d342b8572d7f74b690cae605b05 (diff) | |
u/fuel: Bump & rebase for debian_ip lowercase fix
While at it, revert commit adding "opnfv" user to "libvirt" group,
as it would break with the current event flow (opnfv user being
created prior to libvirt group).
Change-Id: I6f5d578153c33dcddac76bc7bc6b428fe6796b1a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 4b7e790d335787ce0837ca47025dd7a14287e52a)
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 | 10 |
1 files changed, 5 insertions, 5 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 75e239a0..d5df3dac 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,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 a5fc061..b2d005b 100755 +index 0afd530..ccf7152 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" - - # KVM, compute node prereqs (libvirt first), VCP deployment +@@ -17,6 +17,7 @@ salt -C 'kvm* or cmp*' file.line \ + /usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py \ + content='iface = iface.lower()' mode='delete' salt -C 'kvm*' pkg.install bridge-utils +salt -C '*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true -@@ -44,6 +45,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do +@@ -47,6 +48,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; }; |