commit 771069beaa170ba193007d7eb6aa3e0330c787be Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Tue Feb 6 13:47:25 2018 +0100 Use role instead of task for openvpn playbooks/groups/buildhw.yml | 2 -- playbooks/groups/buildvm.yml | 3 +-- 2 files changed, 1 insertions(+), 4 deletions(-) --- diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 7e16dc6..45f805a 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -33,8 +33,6 @@ when: not inventory_hostname.startswith('bkernel') - import_tasks: "{{ tasks_path }}/create_swap_file.yml swap_file_path=/var/swap-file swap_file_bs=1M swap_file_count=4096" when: inventory_hostname.endswith('scaleway.rpmfusion.net') - - import_tasks: "{{ tasks_path }}/openvpn_client.yml" - when: not datacenter == 'online' - name: make sure kojid is running service: name=kojid state=started enabled=yes diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 887cb0d..67d1967 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -22,6 +22,7 @@ - base - hosts - apache + - { role: openvpn/client, when: datacenter != "online" } - { role: nfs/client, mnt_dir: '/mnt/rpmfusion_koji', nfs_src_dir: "{{ koji_hub_nfs }}" } - { role: fas_client, when: not inventory_hostname.startswith('bkernel') } - { role: sudo, when: not inventory_hostname.startswith('bkernel') } @@ -32,8 +33,6 @@ when: not inventory_hostname.startswith('bkernel') - import_tasks: "{{ tasks_path }}/motd.yml" when: not inventory_hostname.startswith('bkernel') - - import_tasks: "{{ tasks_path }}/openvpn_client.yml" - when: not datacenter == 'online' - name: make sure kojid is running service: name=kojid state=running enabled=yes