diff --git a/defaults/main.yaml b/defaults/main.yaml index 64909cc..1a3add9 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -1,5 +1,3 @@ --- -buildbot_worker_name: buildbot-worker -buildbot_worker_password: "{{ ansible_local[_local_facts_id].worker_password }}" buildbot_worker_admin_info: "" buildbot_worker_host_info: "" diff --git a/tasks/local_facts.yaml b/tasks/local_facts.yaml deleted file mode 100644 index b494c74..0000000 --- a/tasks/local_facts.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- - -- name: ansible local facts directory - file: - path: /etc/ansible/facts.d - state: directory - -- name: set ansible local fact - copy: - content: "{{_local_facts|to_json}}" - dest: /etc/ansible/facts.d/{{_local_facts_id}}.fact - mode: 0600 - register: _local_facts_set - -- name: Gathering Facts - setup: - when: _local_facts_set.changed diff --git a/tasks/main.yaml b/tasks/main.yaml index 6346590..aea7713 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -1,5 +1,4 @@ --- -- import_tasks: local_facts.yaml - import_tasks: setup.yaml - import_tasks: buildbot-worker.yaml diff --git a/vars/main.yaml b/vars/main.yaml index 5e82df0..1cdc2b5 100644 --- a/vars/main.yaml +++ b/vars/main.yaml @@ -1,8 +1,4 @@ --- -_local_facts_id: buildbot_worker_{{buildbot_worker_name}} -_local_facts: - worker_password: "{% if not ansible_local[_local_facts_id].worker_password is defined %}{{ lookup('password', '/dev/null length=16 chars=ascii_letters') }}{% else %}{{ ansible_local[_local_facts_id].worker_password }}{% endif %}" - buildbot_worker_user: "{{ buildbot_worker_name }}" buildbot_worker_group: "{{ buildbot_worker_name }}" buildbot_worker_home_directory: "/var/lib/buildbot-worker/{{ buildbot_worker_name }}"