From ae09ced8721f635138dad6c27be7b9a53deda5f0 Mon Sep 17 00:00:00 2001 From: dgalloway Date: Wed, 30 Sep 2015 15:11:26 -0400 Subject: [PATCH] testnode: set_hostname should be a global task Signed-off-by: dgalloway --- roles/testnode/tasks/main.yml | 6 ++++++ roles/testnode/tasks/{redhat => }/set_hostname.yml | 0 roles/testnode/tasks/setup-redhat.yml | 6 ------ 3 files changed, 6 insertions(+), 6 deletions(-) rename roles/testnode/tasks/{redhat => }/set_hostname.yml (100%) diff --git a/roles/testnode/tasks/main.yml b/roles/testnode/tasks/main.yml index 6e484a8c..bc1c8772 100644 --- a/roles/testnode/tasks/main.yml +++ b/roles/testnode/tasks/main.yml @@ -17,6 +17,12 @@ group: root mode: 0755 +- name: Set the hostname + include: set_hostname.yml + when: lab_domain != "" + tags: + - hostname + # upload custom disk monitoring scripts - include: disk_monitoring.yml tags: diff --git a/roles/testnode/tasks/redhat/set_hostname.yml b/roles/testnode/tasks/set_hostname.yml similarity index 100% rename from roles/testnode/tasks/redhat/set_hostname.yml rename to roles/testnode/tasks/set_hostname.yml diff --git a/roles/testnode/tasks/setup-redhat.yml b/roles/testnode/tasks/setup-redhat.yml index 073d8a1c..667e4cd1 100644 --- a/roles/testnode/tasks/setup-redhat.yml +++ b/roles/testnode/tasks/setup-redhat.yml @@ -1,10 +1,4 @@ --- -- name: Set the hostname - include: redhat/set_hostname.yml - when: lab_domain != "" - tags: - - hostname - - name: Include rhel 7.x specific tasks. include: redhat/rhel_7.yml when: ansible_distribution_major_version == "7" -- 2.47.3