Update documentation for lab_domain var

diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst
index e9ea95088ab098c6c89746b2d6a3fac2cda7faa2..4d235a0260d59362010cc2006d1203163d8529c2 100644 (file)
--- a/roles/testnode/README.rst
+++ b/roles/testnode/README.rst
@@ -152,8 +152,9 @@ A list of ntp servers to use::
       - 2.us.pool.ntp.org
       - 3.us.pool.ntp.org
 
-The lab domain to strip from hostname on rhel 7.x nodes. This is only done if ``lab_domain``
-is defined::
+The lab domain to use when populating systems in cobbler.  (See ``roles/cobbler_systems/tasks/populate_systems.yml``)
+This variable is also used to strip the domain from RHEL and CentOS testnode hostnames
+The latter is only done if ``lab_domain`` is defined::
 
     lab_domain: ''
 
@@ -169,7 +170,7 @@ gpg-keys
     Install gpg keys on Fedora.    
 
 hostname
-    Strip ``lab_domain`` from the hostname on Rhel 7.
+    Check and set proper fqdn. See, ``roles/testnode/tasks/set_hostname.yml``.
 
 kernel_logging
     Runs a script that enabled kernel logging to the console on ubuntu.        

diff --git a/roles/testnode/defaults/main.yml b/roles/testnode/defaults/main.yml
index caad337d374d8cfc6d6ed589fe7784f9a633211f..abeab7d272376e4754885e53b4d667f4528da0e5 100644 (file)
--- a/roles/testnode/defaults/main.yml
+++ b/roles/testnode/defaults/main.yml
@@ -46,9 +46,7 @@ start_rpcbind: true
 # 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.
+# used to ensure proper full and short fqdn on testnodes
 lab_domain: ""
 
 ntp_servers: