From mboxrd@z Thu Jan 1 00:00:00 1970 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 03B2414B065 for ; Fri, 12 Apr 2024 17:47:23 +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=1712944044; cv=none; b=Yx7LOrveLTw2I4oqhi5JNUDYnPrEXLRLEfFTVEo4JyQc7aOl0AyKYTx5Max+U9TcPQp8J1Ff6MftcdvFqHHK5Qwu79xT3ZFm6Bpzs+fyzMbsOn0gifMDZeoE04FW/Ux3weqAdwacAk6Cr/beVMSFxN7qG3uAqhvVauzMuLtnEz8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712944044; c=relaxed/simple; bh=NyWjQdigRQ59nYiFhP/wnJqZEV/sRhv4kJxiGsWtSbc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AQNRQevFVgM5sGjuGvwiw8KdA08uzt5Q1jEd0Okr5Bpm61QStSXEEMLnNKYm5UWJmkGXWQWglaiqZ01i3BesFCwu2fekTA/xYGwI0qCL+00ROUfwYLCBOuXLo81jNvH8gY3YGVJys5rt4dDC9/vSfpaU2LHnQNHKLGp4bs2Zcbk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dUBy7AA/; 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="dUBy7AA/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99992C113CC; Fri, 12 Apr 2024 17:47:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712944043; bh=NyWjQdigRQ59nYiFhP/wnJqZEV/sRhv4kJxiGsWtSbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dUBy7AA/b2h5HVSvDtVlL4PswXMxaYF4kx8LGDy/mEE89TlTnAMeEYMqttZeJc7IH DqxExb+ra8vc3kKDS5V5DbBU1X25jEIXzoXBYt7Xu2z4wJ/rUGWH/usmgTi+zEAYnQ v1gKFWJcLnxI93QIGKuJQAr7WJzOVeQzkbGmcFVYlJJhg6veNGzR67glj/NP2hNkis bRgfY3kFA7ul9Kiruper2opi0YPA745w49l40U1NsPG4K7M0FBfJH9d7mycVRrvjhN 4oCEkOQ8sl+LvcpoGYbXlI1bYHpXUZM46VYfL3BX9/m6tcK3aCPH0TobBNhFixopho 5AaJJLu0PSlmw== From: cel@kernel.org To: Cc: Chuck Lever Subject: [RFC PATCH 20/22] nfsd: Replace the use of the community.general.zypper module Date: Fri, 12 Apr 2024 13:46:53 -0400 Message-ID: <20240412174655.722290-21-cel@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240412174655.722290-1-cel@kernel.org> References: <20240412174655.722290-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever Also de-duplicate the logic that builds the nfsd_packages list. Signed-off-by: Chuck Lever --- .../nfsd/tasks/install-deps/debian/main.yml | 36 ---------------- .../nfsd/tasks/install-deps/redhat/main.yml | 33 --------------- .../nfsd/tasks/install-deps/suse/main.yml | 34 --------------- playbooks/roles/nfsd/tasks/main.yml | 42 +++++++++++++++---- playbooks/roles/nfsd/vars/Debian.yml | 3 ++ playbooks/roles/nfsd/vars/RedHat.yml | 2 + playbooks/roles/nfsd/vars/Suse.yml | 4 ++ 7 files changed, 42 insertions(+), 112 deletions(-) delete mode 100644 playbooks/roles/nfsd/tasks/install-deps/debian/main.yml delete mode 100644 playbooks/roles/nfsd/tasks/install-deps/redhat/main.yml delete mode 100644 playbooks/roles/nfsd/tasks/install-deps/suse/main.yml diff --git a/playbooks/roles/nfsd/tasks/install-deps/debian/main.yml b/playbooks/roles/nfsd/tasks/install-deps/debian/main.yml deleted file mode 100644 index 2a2b7899055a..000000000000 --- a/playbooks/roles/nfsd/tasks/install-deps/debian/main.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- name: Get OS-specific variables - ansible.builtin.include_vars: "{{ lookup('ansible.builtin.first_found', params) }}" - vars: - params: - files: - - '{{ansible_distribution}}.yml' - - '{{ansible_os_family}}.yml' - - default.yml - paths: - - 'vars' - -- name: Determine which fsprogs package is needed for "{{ nfsd_export_fstype }}" - set_fact: - fsprogs: "{{ fstype_userspace_progs[nfsd_export_fstype] | default() }}" - -- name: Add {{ fsprogs }} to the nfsd packages list - set_fact: - nfsd_packages: "{{ nfsd_packages + [fsprogs] }}" - when: - - fsprogs is defined - - fsprogs - -- name: Add gssproxy to the nfsd packages list - set_fact: - nfsd_packages: "{{ nfsd_packages + ['gssproxy'] }}" - when: kdevops_krb5_enable|bool - -- name: Install nfsd dependencies - become: yes - become_method: sudo - apt: - name: "{{ nfsd_packages }}" - state: present - update_cache: yes - tags: [ 'pynfs', 'deps' ] diff --git a/playbooks/roles/nfsd/tasks/install-deps/redhat/main.yml b/playbooks/roles/nfsd/tasks/install-deps/redhat/main.yml deleted file mode 100644 index d5d25c205f6e..000000000000 --- a/playbooks/roles/nfsd/tasks/install-deps/redhat/main.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- name: Get OS-specific variables - ansible.builtin.include_vars: "{{ lookup('ansible.builtin.first_found', params) }}" - vars: - params: - files: - - '{{ansible_distribution}}.yml' - - '{{ansible_os_family}}.yml' - - default.yml - paths: - - 'vars' - -- name: Determine which fsprogs package is needed for "{{ nfsd_export_fstype }}" - set_fact: - fsprogs: "{{ fstype_userspace_progs[nfsd_export_fstype] | default() }}" - -- name: Add {{ fsprogs }} to the nfsd packages list - set_fact: - nfsd_packages: "{{ nfsd_packages + [fsprogs] }}" - when: - - fsprogs is defined - - fsprogs - -- name: Install nfsd dependencies - become: yes - become_method: sudo - yum: - update_cache: yes - name: "{{ nfsd_packages }}" - retries: 3 - delay: 5 - register: result - until: result.rc == 0 diff --git a/playbooks/roles/nfsd/tasks/install-deps/suse/main.yml b/playbooks/roles/nfsd/tasks/install-deps/suse/main.yml deleted file mode 100644 index 5bda13c9e605..000000000000 --- a/playbooks/roles/nfsd/tasks/install-deps/suse/main.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -- name: Get OS-specific variables - ansible.builtin.include_vars: "{{ lookup('ansible.builtin.first_found', params) }}" - vars: - params: - files: - - '{{ansible_distribution}}.yml' - - '{{ansible_os_family}}.yml' - - default.yml - paths: - - 'vars' - -- name: Determine which fsprogs package is needed for "{{ nfsd_export_fstype }}" - set_fact: - fsprogs: "{{ fstype_userspace_progs[nfsd_export_fstype] | default() }}" - -- name: Add {{ fsprogs }} to the nfsd packages list - set_fact: - nfsd_packages: "{{ nfsd_packages + [fsprogs] }}" - when: - - fsprogs is defined - - fsprogs - -- name: Add additional packages needed for krb5 to the nfsd packages list - set_fact: - nfsd_packages: "{{ nfsd_packages + ['gssproxy', 'libverto-libev1'] }}" - when: kdevops_krb5_enable|bool - -- name: Install nfsd dependencies - become: yes - become_method: sudo - zypper: - name: "{{ nfsd_packages }}" - state: present diff --git a/playbooks/roles/nfsd/tasks/main.yml b/playbooks/roles/nfsd/tasks/main.yml index fe5f6919864d..3118b72c88dd 100644 --- a/playbooks/roles/nfsd/tasks/main.yml +++ b/playbooks/roles/nfsd/tasks/main.yml @@ -1,15 +1,39 @@ --- -- name: Debian-specific setup - ansible.builtin.include_tasks: roles/nfsd/tasks/install-deps/debian/main.yml - when: ansible_os_family == 'Debian' +- name: Set OS-specific variables + ansible.builtin.include_vars: "{{ lookup('ansible.builtin.first_found', params) }}" + vars: + params: + files: + - '{{ ansible_distribution }}.yml' + - '{{ ansible_os_family }}.yml' + - default.yml + paths: + - 'vars' + tags: vars -- name: SuSE-specific setup - ansible.builtin.include_tasks: roles/nfsd/tasks/install-deps/suse/main.yml - when: ansible_os_family == 'Suse' +- name: Determine the fsprogs package needed for "{{ nfsd_export_fstype }}" + ansible.builtin.set_fact: + fsprogs: "{{ fstype_userspace_progs[nfsd_export_fstype] | default() }}" -- name: Red Hat-specific setup - ansible.builtin.include_tasks: roles/nfsd/tasks/install-deps/redhat/main.yml - when: ansible_os_family == 'RedHat' +- name: Add fsprogs dependencies to the nfsd_packages list + ansible.builtin.set_fact: + nfsd_packages: "{{ nfsd_packages + [fsprogs] }}" + when: + - fsprogs is defined + - fsprogs + +- name: Add krb5 dependencies to the nfsd packages list + ansible.builtin.set_fact: + nfsd_packages: "{{ nfsd_packages + krb5_packages }}" + when: kdevops_krb5_enable|bool + +- name: Install dependencies for nfsd + become: true + become_flags: 'su - -c' + become_method: ansible.builtin.sudo + ansible.builtin.package: + name: "{{ nfsd_packages }}" + state: present - name: Generate /etc/nfs.conf become: yes diff --git a/playbooks/roles/nfsd/vars/Debian.yml b/playbooks/roles/nfsd/vars/Debian.yml index d8aa50bcdd9b..59351e762cfd 100644 --- a/playbooks/roles/nfsd/vars/Debian.yml +++ b/playbooks/roles/nfsd/vars/Debian.yml @@ -5,6 +5,9 @@ nfsd_packages: - nfs-kernel-server - policycoreutils +krb5_packages: + - gssproxy + fstype_userspace_progs: btrfs: btrfs-progs ext4: e2fsprogs diff --git a/playbooks/roles/nfsd/vars/RedHat.yml b/playbooks/roles/nfsd/vars/RedHat.yml index 091c827c777d..c66c9168786a 100644 --- a/playbooks/roles/nfsd/vars/RedHat.yml +++ b/playbooks/roles/nfsd/vars/RedHat.yml @@ -6,6 +6,8 @@ nfsd_packages: - policycoreutils - python3-policycoreutils +krb5_packages: [] + fstype_userspace_progs: btrfs: btrfs-progs ext4: e2fsprogs diff --git a/playbooks/roles/nfsd/vars/Suse.yml b/playbooks/roles/nfsd/vars/Suse.yml index 786e5f81ece5..c28f97d6a0c0 100644 --- a/playbooks/roles/nfsd/vars/Suse.yml +++ b/playbooks/roles/nfsd/vars/Suse.yml @@ -4,6 +4,10 @@ nfsd_packages: - nfs-utils - policycoreutils +krb5_packages: + - gssproxy + - libverto-libev1 + fstype_userspace_progs: btrfs: btrfsprogs ext4: e2fsprogs -- 2.44.0