From fe4985db6075779a72586f41e0a2c7c904bcc6ca Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Fri, 1 May 2020 21:18:34 +0800 Subject: [PATCH] playbookconfig: set longer timeout and add retries for ansible - Set longer timeout and add retries for ansible ssh connection to avoid timeout failure: "timeout waiting for privilege escalation password prompt:\n" - Change the postinst_ontarget to postinst to avoid hidden issue Issue-ID: INF-73 Signed-off-by: Jackie Huang Change-Id: Ia7d1c6ce7cfdb0b13516ab92625eb8d8107ffe00 --- .../recipes-core/stx-ansible-playbooks/playbookconfig.bb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/meta-stx/recipes-core/stx-ansible-playbooks/playbookconfig.bb b/meta-stx/recipes-core/stx-ansible-playbooks/playbookconfig.bb index 4336ab6..a198bfd 100644 --- a/meta-stx/recipes-core/stx-ansible-playbooks/playbookconfig.bb +++ b/meta-stx/recipes-core/stx-ansible-playbooks/playbookconfig.bb @@ -68,12 +68,18 @@ do_install () { DESTDIR=${D}/${datadir}/ansible/stx-ansible } -pkg_postinst_ontarget_${PN}() { - cp /etc/ansible/ansible.cfg /etc/ansible/ansible.cfg.orig - cp /etc/ansible/hosts /etc/ansible/hosts.orig - cp /usr/share/ansible/stx-ansible/playbooks/ansible.cfg /etc/ansible - cp /usr/share/ansible/stx-ansible/playbooks/hosts /etc/ansible +ANSIBLE_SSH_TIMEOUT = "60" +ANSIBLE_SSH_RETRY = "3" +pkg_postinst_${PN}() { + cp $D${sysconfdir}/ansible/ansible.cfg $D${sysconfdir}/ansible/ansible.cfg.orig + cp $D${sysconfdir}/ansible/hosts $D${sysconfdir}/ansible/hosts.orig + cp $D${datadir}/ansible/stx-ansible/playbooks/ansible.cfg $D${sysconfdir}/ansible + cp $D${datadir}/ansible/stx-ansible/playbooks/hosts $D${sysconfdir}/ansible + + sed -i -e 's/#timeout = .*/timeout = ${ANSIBLE_SSH_TIMEOUT}/' \ + -e 's/#retries = .*/retries = ${ANSIBLE_SSH_RETRY}/' \ + $D${sysconfdir}/ansible/ansible.cfg } FILES_${PN} = " \ -- 2.16.6