diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-08 16:59:11 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-08 17:21:27 +0100 |
commit | 91d249e3087014902930e2475facd40077d3aedd (patch) | |
tree | ca1f4bf204e9b058b7dbb81a2ae8154903a0370f /patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch | |
parent | 22f9c97db5345d47768ae0552f9f175a5b3356ce (diff) |
u/fuel: Bump & rebase for Ubuntu `modprobe -f` fix
Squash in additional changes:
- p/fuel: Retry armband state, fail on not connected
- u/fuel: Bump & rebase for wait_for changes
While at it, catch armband state minion timeout (not connected or no
response) and reduce armband state retry from 10 to 5.
We no longer expect the armband state to fail on any nodes,
baremetal or virtual, kvm or cmp, so remove failsafe `|| true`
and retry state apply in case minions did not repond.
JIRA: ARMBAND-350
Change-Id: I7b4302a89d60c94ab3f58cd6b8523cf668314a05
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commmit 6eab8c989c257213586347f284362cc43f99d3f4)
(cherry picked from commmit 29c39fd5a8fc8a4bb058b5c18a6c1d6a29544f4f)
Diffstat (limited to 'patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch')
-rw-r--r-- | patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch index b3b1afc5..203021a5 100644 --- a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch @@ -15,14 +15,14 @@ Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> --- mcp/config/states/baremetal_init | 1 + - mcp/config/states/virtual_control_plane | 2 ++ + mcp/config/states/virtual_control_plane | 1 + mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml | 4 ++++ mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++ - 4 files changed, 14 insertions(+) + 4 files changed, 13 insertions(+) create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init -index 121dc8d..d343ae9 100755 +index c963e59..ab322db 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ @@ -34,16 +34,15 @@ index 121dc8d..d343ae9 100755 salt -C 'kvm* or cmp*' state.apply salt.minion salt -C 'kvm* or cmp*' service.force_reload salt-minion diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 9240f76..104281d 100755 +index d717f39..7ef4e15 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -50,6 +50,8 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do +@@ -49,6 +49,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do ((attempt+=1)) done -+wait_for 5 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply opnfv.adduser | " \ -+ "tee /dev/stderr | grep -Fq 'Not connected'" - wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all" ++wait_for 5.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply opnfv.adduser" + wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all" # Propagate APT proxy config created by curtin on baremetal nodes to VCP VMs diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml |