From patchwork Tue Oct 8 17:19:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13826741 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6504C1E1A08 for ; Tue, 8 Oct 2024 17:19:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728407987; cv=none; b=cMKYFK4oSMZ1XKacLftxfY/ZoAJ+tVREPQG1c/oKUwmfU2HLkhPQiOJn7kaHPIzufk+d0jsbOgsC/JtVfSfMKGjoToGL74wr9EtFOVvbbVEMT3Q4aHnHzQNXHboslGY735S4ifzaXlpfYS4VxcAMq5U3prdyfnvAwr+o3iNiqiw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728407987; c=relaxed/simple; bh=xM9AmYpooGU+HH3J/ZbiXiraEhqHgPF5wNFTrQGSuaw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=DsTdbgKXgs8X3CD1T7kdnvTrosOVicfYpV9Gw0av8bArwqhfMFWQ8z+SXTs4AZEpf3Kj1ppQPaEbgcuc3IUL4BhDPDcqZKToZqNGjtv6JQVFuW8/PlwTEvj84ap9o1ZW+v8Gi1zu01Pbm6f18oR/Q+d/mW3CKtXfF2xV7PjtPO0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LHYaW0JA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LHYaW0JA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74B6FC4CEC7; Tue, 8 Oct 2024 17:19:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728407986; bh=xM9AmYpooGU+HH3J/ZbiXiraEhqHgPF5wNFTrQGSuaw=; h=From:To:Cc:Subject:Date:From; b=LHYaW0JA0BoGc1Gn6tNckQS9k4YsfPbzxAk8bJb6ZNY+ZC4X0p5zV49kPEu69tcKU 48wUMiA6XsOBzMbXhE8LlrfZwVE5DXJDz6YipTVAVl0qtyt67NA5yeB1Acfb6XW5h6 0AwlUOxw0OpLb9UgERzOlbVnGpbyP6+14NfkxM3/4eUT9wNWzmas1COQCwuwtCaKta t1fasIh6d7RWum9x8J09wagxxAg4OVPPkyO4OGnBsIdAt6zg42F6hTRYk1ulbKpZGV pWKMj/hvRysCR2j5Z0SfXGtESBtSFxBcYeriet75+5JrhK1+AMJhM7qAUuqxDXrdY8 f7/drq5MQT8Qw== From: cel@kernel.org To: Cc: Chuck Lever , Scott Mayhew Subject: [RFC PATCH] Fix Ansible ".rc not defined in dictionary" failure Date: Tue, 8 Oct 2024 13:19:43 -0400 Message-ID: <20241008171943.937937-1-cel@kernel.org> X-Mailer: git-send-email 2.46.1 Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever If yum/dnf fails, the Ansible script reports this breakage rather than the actual failure. There are other instances of "until: rc == 0" that are not replaced here. Examples are checks for apt-get failure and plug-in failure. These might also need attention. Suggested-by: Scott Mayhew Signed-off-by: Chuck Lever Reviewed-by: Luis Chamberlain --- .../roles/bootlinux/tasks/install-deps/redhat/main.yml | 6 +++--- .../tasks/install-deps/redhat/main.yml | 2 +- .../roles/devconfig/tasks/install-deps/redhat/main.yml | 8 ++++---- .../roles/fstests/tasks/install-deps/redhat/main.yml | 10 +++++----- .../tasks/install-deps/redhat/main.yml | 2 +- .../tasks/install-deps/redhat/main.yml | 2 +- .../tasks/install-deps/redhat/main.yml | 2 +- playbooks/roles/kdc/tasks/install-deps/redhat/main.yml | 2 +- .../roles/krb5/tasks/install-deps/redhat/main.yml | 2 +- .../roles/ktls/tasks/install-deps/redhat/main.yml | 2 +- .../roles/nfsd/tasks/install-deps/redhat/main.yml | 2 +- .../roles/pynfs/tasks/install-deps/redhat/main.yml | 2 +- .../roles/smbd/tasks/install-deps/redhat/main.yml | 2 +- .../roles/sysbench/tasks/install-deps/redhat/main.yml | 4 ++-- 14 files changed, 24 insertions(+), 24 deletions(-) Posted for review while I test it. diff --git a/playbooks/roles/bootlinux/tasks/install-deps/redhat/main.yml b/playbooks/roles/bootlinux/tasks/install-deps/redhat/main.yml index cb5399ed6afd..acb9380cdb65 100644 --- a/playbooks/roles/bootlinux/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/bootlinux/tasks/install-deps/redhat/main.yml @@ -8,7 +8,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - epel-release @@ -23,7 +23,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - bison @@ -71,7 +71,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - btrfs-progs diff --git a/playbooks/roles/create_partition/tasks/install-deps/redhat/main.yml b/playbooks/roles/create_partition/tasks/install-deps/redhat/main.yml index 8d276e569f35..135c032553dd 100644 --- a/playbooks/roles/create_partition/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/create_partition/tasks/install-deps/redhat/main.yml @@ -19,7 +19,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - btrfs-progs diff --git a/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml b/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml index 707844310ef8..60d149696b8c 100644 --- a/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml @@ -42,7 +42,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded when: - devconfig_try_upgrade|bool @@ -144,7 +144,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded when: - devconfig_try_install_kdevtools|bool @@ -188,7 +188,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded when: - devconfig_enable_systemd_journal_remote|bool - ansible_facts['os_family']|lower == 'redhat' or ansible_facts['distribution_major_version'] | int >= 8 @@ -203,7 +203,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded when: - devconfig_enable_systemd_timesyncd|bool tags: timesyncd diff --git a/playbooks/roles/fstests/tasks/install-deps/redhat/main.yml b/playbooks/roles/fstests/tasks/install-deps/redhat/main.yml index fc4208db0bbe..a4201e7ca682 100644 --- a/playbooks/roles/fstests/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/fstests/tasks/install-deps/redhat/main.yml @@ -22,7 +22,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - epel-release @@ -37,7 +37,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - bison @@ -98,7 +98,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - xfsprogs-xfs_scrub @@ -114,7 +114,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - btrfs-progs @@ -130,7 +130,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - inih-devel diff --git a/playbooks/roles/fstests_prep_localhost/tasks/install-deps/redhat/main.yml b/playbooks/roles/fstests_prep_localhost/tasks/install-deps/redhat/main.yml index 3d086b0fe8e1..1f42ebcb972c 100644 --- a/playbooks/roles/fstests_prep_localhost/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/fstests_prep_localhost/tasks/install-deps/redhat/main.yml @@ -8,7 +8,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - python3-junitxml diff --git a/playbooks/roles/install_systemd_journal_remote/tasks/install-deps/redhat/main.yml b/playbooks/roles/install_systemd_journal_remote/tasks/install-deps/redhat/main.yml index 72c2eeeeebf1..646fc0ee1e3f 100644 --- a/playbooks/roles/install_systemd_journal_remote/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/install_systemd_journal_remote/tasks/install-deps/redhat/main.yml @@ -8,7 +8,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded when: - devconfig_enable_systemd_journal_remote|bool tags: journal diff --git a/playbooks/roles/install_systemd_timesyncd/tasks/install-deps/redhat/main.yml b/playbooks/roles/install_systemd_timesyncd/tasks/install-deps/redhat/main.yml index 1a19d099d8a3..d80720637774 100644 --- a/playbooks/roles/install_systemd_timesyncd/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/install_systemd_timesyncd/tasks/install-deps/redhat/main.yml @@ -8,7 +8,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded when: - devconfig_enable_systemd_timesyncd|bool tags: timesyncd diff --git a/playbooks/roles/kdc/tasks/install-deps/redhat/main.yml b/playbooks/roles/kdc/tasks/install-deps/redhat/main.yml index c393920d95f6..f92f51099ded 100644 --- a/playbooks/roles/kdc/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/kdc/tasks/install-deps/redhat/main.yml @@ -8,7 +8,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - krb5-server diff --git a/playbooks/roles/krb5/tasks/install-deps/redhat/main.yml b/playbooks/roles/krb5/tasks/install-deps/redhat/main.yml index 511f221f0866..109f575bdd14 100644 --- a/playbooks/roles/krb5/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/krb5/tasks/install-deps/redhat/main.yml @@ -8,7 +8,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - krb5-libs diff --git a/playbooks/roles/ktls/tasks/install-deps/redhat/main.yml b/playbooks/roles/ktls/tasks/install-deps/redhat/main.yml index 802ef2a4c3ed..6920ab7bf92c 100644 --- a/playbooks/roles/ktls/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/ktls/tasks/install-deps/redhat/main.yml @@ -39,7 +39,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - python3-cryptography diff --git a/playbooks/roles/nfsd/tasks/install-deps/redhat/main.yml b/playbooks/roles/nfsd/tasks/install-deps/redhat/main.yml index d5d25c205f6e..5093e3b718c5 100644 --- a/playbooks/roles/nfsd/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/nfsd/tasks/install-deps/redhat/main.yml @@ -30,4 +30,4 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded diff --git a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml index 0f98aad99eed..f4aee14c5430 100644 --- a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml @@ -22,7 +22,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - gcc diff --git a/playbooks/roles/smbd/tasks/install-deps/redhat/main.yml b/playbooks/roles/smbd/tasks/install-deps/redhat/main.yml index 1f4e62b71cf8..92baaee36713 100644 --- a/playbooks/roles/smbd/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/smbd/tasks/install-deps/redhat/main.yml @@ -30,4 +30,4 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded diff --git a/playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml b/playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml index d63b66fb0d3d..abe95cb0c5a0 100644 --- a/playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml @@ -22,7 +22,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - epel-release @@ -37,7 +37,7 @@ retries: 3 delay: 5 register: result - until: result.rc == 0 + until: result is succeeded vars: packages: - docker