From 6701c31497c85357a563640fc4b3a2d2541b4772 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 9 Jul 2015 14:26:05 -0500 Subject: [PATCH] testnode: make lab_domain an optional var lab_domain is used to strip the domain from the nodes hostname, this allows that task to be skipped if lab_domain isn't provided. I believe we only do this because of some quirk in how cobbler images our rhel nodes, we might not even need this functionality. Signed-off-by: Andrew Schoen --- roles/testnode/defaults/main.yml | 5 +++++ roles/testnode/tasks/redhat/set_hostname.yml | 2 +- roles/testnode/tasks/setup-redhat.yml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/roles/testnode/defaults/main.yml b/roles/testnode/defaults/main.yml index b621890..08b78c3 100644 --- a/roles/testnode/defaults/main.yml +++ b/roles/testnode/defaults/main.yml @@ -27,3 +27,8 @@ start_rpcbind: true # mount options, which is useful for long lived bare metal machines, # less useful for virtual machines that are re-imaged before each job modify_fstab: true + +# used to remove lab_domain from the hostname on rhel nodes +# FIXME: I believe this is only needed because of a quirk in how rhel +# nodes are imaged in our labs. This might not be needed at all. +lab_domain: "" diff --git a/roles/testnode/tasks/redhat/set_hostname.yml b/roles/testnode/tasks/redhat/set_hostname.yml index d49bbda..3424f67 100644 --- a/roles/testnode/tasks/redhat/set_hostname.yml +++ b/roles/testnode/tasks/redhat/set_hostname.yml @@ -14,7 +14,7 @@ set_fact: new_hostname: "{{ existing_hostname.stdout.split('.')[0] }}" when: existing_hostname is defined and - existing_hostname.stdout.find("{{ lab_domain | mandatory }}") != -1 + existing_hostname.stdout.find("{{ lab_domain }}") != -1 - name: Set hostname. hostname: diff --git a/roles/testnode/tasks/setup-redhat.yml b/roles/testnode/tasks/setup-redhat.yml index 2018a7c..073d8a1 100644 --- a/roles/testnode/tasks/setup-redhat.yml +++ b/roles/testnode/tasks/setup-redhat.yml @@ -1,6 +1,7 @@ --- - name: Set the hostname include: redhat/set_hostname.yml + when: lab_domain != "" tags: - hostname -- 2.39.5