From: dgalloway Date: Wed, 30 Sep 2015 20:27:58 +0000 (-0400) Subject: Update documentation for lab_domain var X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F145%2Fhead;p=ceph-cm-ansible.git Update documentation for lab_domain var --- diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst index e9ea9508..4d235a02 100644 --- 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 caad337d..abeab7d2 100644 --- 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: