diff --git a/install@vps.yml b/install@vps.yml index d6dc3f4..fb9c547 100644 --- a/install@vps.yml +++ b/install@vps.yml @@ -1,5 +1,5 @@ --- -- name: Bootstrap virtual private server +- name: Install packages hosts: vps gather_facts: yes vars: @@ -32,7 +32,24 @@ register: core_done tags: ['default', 'core'] - name: Install additional packages - block: ~ - register: extra_pkgs_done + block: + - name: Get core package list + include_vars: + file: "{{ roles_path }}/bootstrap/defaults/core_pkgs@{{ FAMILY }}.yml" + name: pkgs + register: pkgs_src + - name: Get custom package list + include_vars: + file: "{{ roles_path }}/bootstrap/defaults/custom_pkgs@{{ FAMILY }}.yml" + name: cpkgs + register: cpkgs_src + - name: Install additional packages + become: yes + become_method: sudo + include_role: + tasks_from: extra_installations.yml + vars: + extra_packages: ["{{ pkgs.media_pkgs | combine(cpkgs.my_pkgs) }}"] + register: extra_pkgs_done when: want_extra_pkgs tags: ['extra_pkgs'] \ No newline at end of file