From 88eeff60afc40ecfaa4964e2fccb4d7381c41acc Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 18 Nov 2015 19:13:30 -0800 Subject: [PATCH] openqa: we want openqa_hostname as a role *default* variable it seems variables in vars/main.yml are 'role variables' with a high precedence, while variables in defaults/main.yml are 'role default variables' with a low precedence. This could be made a hell of a lot clearer in the docs. --- roles/openqa/dispatcher/{vars => defaults}/main.yml | 0 roles/openqa/worker/{vars => defaults}/main.yml | 0 roles/openqa/worker/tasks/main.yml | 3 --- 3 files changed, 3 deletions(-) rename roles/openqa/dispatcher/{vars => defaults}/main.yml (100%) rename roles/openqa/worker/{vars => defaults}/main.yml (100%) diff --git a/roles/openqa/dispatcher/vars/main.yml b/roles/openqa/dispatcher/defaults/main.yml similarity index 100% rename from roles/openqa/dispatcher/vars/main.yml rename to roles/openqa/dispatcher/defaults/main.yml diff --git a/roles/openqa/worker/vars/main.yml b/roles/openqa/worker/defaults/main.yml similarity index 100% rename from roles/openqa/worker/vars/main.yml rename to roles/openqa/worker/defaults/main.yml diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml index 94c49f31a6..70c4c70ed9 100644 --- a/roles/openqa/worker/tasks/main.yml +++ b/roles/openqa/worker/tasks/main.yml @@ -30,9 +30,6 @@ - include: nfs-client.yml when: openqa_hostname is defined and openqa_hostname != "localhost" -- name: Debug openqa_hostname var - debug: var=openqa_hostname - - name: openQA client config template: src=client.conf.j2 dest=/etc/openqa/client.conf owner=_openqa-worker group=root mode=0600 tags: