summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-07 22:11:04 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-07 22:19:48 +0100
commit29c39fd5a8fc8a4bb058b5c18a6c1d6a29544f4f (patch)
treeeea6009511d53ae4d62c9ad533e94140a7c689b6 /patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
parentdaf95f3b779db56222be35e04610bac83a53575a (diff)
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. JIRA: ARMBAND-350 Change-Id: Ifd63c401f44e7ae51f50c5739cf1a20b5d27d287 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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.patch15
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 e224e125..a1593c95 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-arch-common/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 2b6666d..85e2237 100755
+index 771182c..82f783d 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 2b6666d..85e2237 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 5565fe5..349ac27 100755
+index ab026ef..4212b8e 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -51,6 +51,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-arch-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml