diff options
| author |   Charalampos Kominos <Charalampos.Kominos@enea.com> | 2017-11-08 12:35:21 +0100 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-08 14:06:41 +0000 |
| commit | abfef7b5acc25201d263e68e61ef01c375818bc9 (patch) | |
| tree | 7b6d0e0e0032208275de4ca51b9ef6c9c54e0a10 /patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch | |
| parent | f02e6423174aec5cce72ca209be9aec2f5562369 (diff) | |
u/fuel: Bump & rebase for curtin network config
Change-Id: Iaaea7494b960b05c4e409eb52daa6b0fa6414e12
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
(cherry picked from commit 00d1b6b2e00803bcb3901b181ec7d97e8062f677)
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 d5df3dac..3418177d 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 0afd530..ccf7152 100755 +index ec1cd00..7746bac 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -17,6 +17,7 @@ salt -C 'kvm* or cmp*' file.line \ +@@ -18,6 +18,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 @@ -32,7 +32,7 @@ index 0afd530..ccf7152 100755 salt -C 'kvm*' state.apply linux.network salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true -@@ -47,6 +48,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do +@@ -48,6 +49,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; }; |