From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 7C069535A6 for ; Sat, 9 Mar 2024 23:36:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710027369; cv=none; b=W0VfflPPC9qD9fKyPYuD6Hg3PpKiGcTx4m+NFbI11HLWW/mgJAYSjOk+tfthsdiT4SwOMrBMlPx7IvVbPaFAMg+Ju1juLETr3jfzH6eDScQF8Hb1sKq41BAzULVxXwUVA7TfVD1OQ6D2lvX7J+1Cjmw5dG/OLYzrVABw/uwf/0k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710027369; c=relaxed/simple; bh=W1eM81sYs0ldIBt4tnCsbb+1AbK2KoVsJDZqauJ2xIs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qL1vkHdx+2HxQjGWlgMrOleLkpJOCwHhXGAxJyMMiBGjH3YEwXT9cuLYBUomiJJBy+q8Lnsfplhphy57bX6B0NozEBChcTeQVRjZBRAtYbERdo7vB5evoMK7cAmxPW/BtWAbWOe8YUK8ZrZ0pHROYQ4uGCD1/zEpyIb3SDFUDp0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=MGOl5gzE; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MGOl5gzE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710027366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F/zaUpkV1Z34PUXeOEC4lu73FEbvXC8X82LCv/xjCEg=; b=MGOl5gzErXp4/Gdi2EEofZaqLgcXNfJC6YDHBKcQwQcBybB2wvHefNuCeBDWu+QWWR1LVP sJXmunGg0FZnx5w3zr3Y8b6G/upDDOW1f7G84wSqDpOprvhwA1PyL7D1JDX9oWm4mNx0N+ 2qepe4/vtV3BnzBrh02bBxMAmZx+1Ks= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-532-8pCqLuPwPRuisgnGlf3meQ-1; Sat, 09 Mar 2024 18:36:04 -0500 X-MC-Unique: 8pCqLuPwPRuisgnGlf3meQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9C0AE800262 for ; Sat, 9 Mar 2024 23:36:04 +0000 (UTC) Received: from aion.redhat.com (unknown [10.22.16.116]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8798017AA6 for ; Sat, 9 Mar 2024 23:36:04 +0000 (UTC) Received: from aion.redhat.com (localhost [IPv6:::1]) by aion.redhat.com (Postfix) with ESMTP id 23C7212D1FF for ; Sat, 9 Mar 2024 18:36:04 -0500 (EST) From: Scott Mayhew To: kdevops@lists.linux.dev Subject: [PATCH v2 08/10] gen_hosts/gen_nodes: clean up nfsd-related stuff Date: Sat, 9 Mar 2024 18:36:01 -0500 Message-ID: <20240309233603.1306533-9-smayhew@redhat.com> In-Reply-To: <20240309233603.1306533-1-smayhew@redhat.com> References: <20240309233603.1306533-1-smayhew@redhat.com> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true First, instead of checking if nfsd_threads is defined, create new variable kdevops_nfsd_enable and use that. Second, if nfsd is not enabled, then there shouldn't be "nfsd" and "nfsd:vars" stanzas in the hosts file, so adjust the placement of the conditionals in the templates accordingly. No change in behavior. Signed-off-by: Scott Mayhew --- playbooks/roles/gen_hosts/defaults/main.yml | 2 ++ playbooks/roles/gen_hosts/templates/fstests.j2 | 4 ++-- playbooks/roles/gen_hosts/templates/gitr.j2 | 4 ++-- playbooks/roles/gen_hosts/templates/hosts.j2 | 6 +++--- playbooks/roles/gen_nodes/defaults/main.yml | 1 + playbooks/roles/gen_nodes/tasks/main.yml | 6 +++--- scripts/nfsd.Makefile | 1 + 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/playbooks/roles/gen_hosts/defaults/main.yml b/playbooks/roles/gen_hosts/defaults/main.yml index ff1212a5..0c49cde0 100644 --- a/playbooks/roles/gen_hosts/defaults/main.yml +++ b/playbooks/roles/gen_hosts/defaults/main.yml @@ -30,3 +30,5 @@ is_fstests: False fstests_fstyp: "bogus" fs_config_role_path: "/dev/null" fs_config_data: "[section_1]" + +kdevops_nfsd_enable: False diff --git a/playbooks/roles/gen_hosts/templates/fstests.j2 b/playbooks/roles/gen_hosts/templates/fstests.j2 index 74057952..b5111ad3 100644 --- a/playbooks/roles/gen_hosts/templates/fstests.j2 +++ b/playbooks/roles/gen_hosts/templates/fstests.j2 @@ -21,9 +21,9 @@ ansible_python_interpreter = "{{ kdevops_python_interpreter }}" {% endif %} [dev:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" +{% if kdevops_nfsd_enable %} [nfsd] -{% if nfsd_threads is defined %} {{ kdevops_hosts_prefix }}-nfsd -{% endif %} [nfsd:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" +{% endif %} diff --git a/playbooks/roles/gen_hosts/templates/gitr.j2 b/playbooks/roles/gen_hosts/templates/gitr.j2 index ba144bfd..d6998bd8 100644 --- a/playbooks/roles/gen_hosts/templates/gitr.j2 +++ b/playbooks/roles/gen_hosts/templates/gitr.j2 @@ -15,9 +15,9 @@ ansible_python_interpreter = "{{ kdevops_python_interpreter }}" {% endif %} [dev:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" +{% if kdevops_nfsd_enable %} [nfsd] -{% if nfsd_threads is defined %} {{ kdevops_hosts_prefix }}-nfsd -{% endif %} [nfsd:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" +{% endif %} diff --git a/playbooks/roles/gen_hosts/templates/hosts.j2 b/playbooks/roles/gen_hosts/templates/hosts.j2 index 57325112..c22b2e39 100644 --- a/playbooks/roles/gen_hosts/templates/hosts.j2 +++ b/playbooks/roles/gen_hosts/templates/hosts.j2 @@ -14,7 +14,7 @@ write-your-own-template-for-your-workflow-and-task {% if kdevops_baseline_and_dev == True %} {{ kdevops_hosts_prefix }}-dev {% endif %} -{% if nfsd_threads is defined %} +{% if kdevops_nfsd_enable %} {{ kdevops_hosts_prefix }}-nfsd {% endif %} [all:vars] @@ -29,10 +29,10 @@ ansible_python_interpreter = "{{ kdevops_python_interpreter }}" {% endif %} [dev:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" +{% if kdevops_nfsd_enable %} [nfsd] -{% if nfsd_threads is defined %} {{ kdevops_hosts_prefix }}-nfsd -{% endif %} [nfsd:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" {% endif %} +{% endif %} diff --git a/playbooks/roles/gen_nodes/defaults/main.yml b/playbooks/roles/gen_nodes/defaults/main.yml index 0e41e0ad..51491d33 100644 --- a/playbooks/roles/gen_nodes/defaults/main.yml +++ b/playbooks/roles/gen_nodes/defaults/main.yml @@ -12,6 +12,7 @@ kdevops_workflow_enable_cxl: False kdevops_workflow_enable_pynfs: False kdevops_workflow_enable_gitr: False kdevops_workflow_enable_selftests: False +kdevops_nfsd_enable: False virtualbox_provider: False libvirt_provider: False diff --git a/playbooks/roles/gen_nodes/tasks/main.yml b/playbooks/roles/gen_nodes/tasks/main.yml index 2f5c48b6..288dbdca 100644 --- a/playbooks/roles/gen_nodes/tasks/main.yml +++ b/playbooks/roles/gen_nodes/tasks/main.yml @@ -47,13 +47,13 @@ set_fact: nfsd_nodes: "{{ [ kdevops_host_prefix + '-nfsd' ] }}" when: - - nfsd_threads is defined + - kdevops_nfsd_enable|bool - name: Add an nfs server if one was selected set_fact: generic_nodes: "{{ generic_nodes + nfsd_nodes }}" when: - - nfsd_threads is defined + - kdevops_nfsd_enable|bool - name: Set fstests config file variable for {{ fstests_fstyp }} set_fact: @@ -215,7 +215,7 @@ fstests_enabled_nodes: "{{ fstests_enabled_nodes + nfsd_nodes }}" when: - is_fstests|bool - - nfsd_threads is defined + - kdevops_nfsd_enable|bool - name: Generate the fstests kdevops nodes file using {{ kdevops_nodes_template }} as jinja2 source template tags: [ 'hosts' ] diff --git a/scripts/nfsd.Makefile b/scripts/nfsd.Makefile index f534f4ff..3accc879 100644 --- a/scripts/nfsd.Makefile +++ b/scripts/nfsd.Makefile @@ -6,6 +6,7 @@ NFSD_EXTRA_ARGS += nfsd_export_fstype='$(subst ",,$(CONFIG_NFSD_EXPORT_FSTYPE))' NFSD_EXTRA_ARGS += nfsd_export_path='$(subst ",,$(CONFIG_NFSD_EXPORT_PATH))' NFSD_EXTRA_ARGS += nfsd_threads=$(CONFIG_NFSD_THREADS) NFSD_EXTRA_ARGS += nfsd_lease_time=$(CONFIG_NFSD_LEASE_TIME) +NFSD_EXTRA_ARGS += kdevops_nfsd_enable=True EXTRA_VAR_INPUTS += extend-extra-args-nfsd -- 2.43.0