adjusting variable names, fixing errors
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
- name: Set ansible default facts # {{{
|
||||
ansible.builtin.set_fact:
|
||||
ansible:
|
||||
install_methods:
|
||||
methods:
|
||||
- system
|
||||
- source
|
||||
pkgname:
|
||||
@@ -25,22 +25,39 @@
|
||||
block:
|
||||
- name: Set ansible install method
|
||||
when:
|
||||
- ansible_install_method is undefined
|
||||
- ansible_imethod is undefined
|
||||
ansible.builtin.set_fact:
|
||||
ansible_install_method: "{{ install_method if install_method in ansible.install_methods else ansible.install_methods[0] }}"
|
||||
ansible_imethod: "{{ imethod if imethod in ansible.methods else ansible.methods[0] }}"
|
||||
|
||||
- name: Append ansible to system package manager install list
|
||||
when:
|
||||
- ansible_install_method == "system"
|
||||
ansible.builtin.set_fact:
|
||||
pkg_sys: "{{ pkg_sys + [ ansible.pkgname[os_family] ] }}"
|
||||
- ansible_imethod == "system"
|
||||
block:
|
||||
- name: Queue ansible sytem install
|
||||
ansible.builtin.set_fact:
|
||||
pkg_sys: "{{ pkg_sys + [ ansible.pkgname[os_family] ] }}"
|
||||
|
||||
- name: Finalise ansible system install
|
||||
ansible.builtin.set_fact:
|
||||
ansible_install: "{{ ansible_imethod }}={{ ansible.pkgname[os_family] }}"
|
||||
|
||||
- name: Append ansible to pipx install list
|
||||
when:
|
||||
- ansible_install_method == 'source'
|
||||
- ansible_imethod == 'source'
|
||||
ansible.builtin.set_fact:
|
||||
pkg_pipx: "{{ pkg_pipx + [ { 'name': ansible.pkgname['pip'] } ] }}"
|
||||
- name: Configure ansible source install
|
||||
ansible.builtin.set_fact:
|
||||
ansible_src_install:
|
||||
name: "{{ ansible.pkgname['pip'] }}"
|
||||
|
||||
- name: Queue ansible source install
|
||||
ansible.builtin.set_fact:
|
||||
pkg_pipx: "{{ pkg_pipx + [ansible_src_install] }}"
|
||||
|
||||
- name: Finalise ansible source install
|
||||
ansible.builtin.set_fact:
|
||||
ansible_install: "{{ ansible_imethod }}={{ ansible_src_install }}"
|
||||
|
||||
- name: Complete ansible configuration
|
||||
ansible.builtin.set_fact:
|
||||
__configured: "{{ __configured | combine( { 'ansible': ansible_install_method } ) }}"
|
||||
__configured: "{{ __configured | combine( { 'ansible': ansible_install } ) }}"
|
||||
|
||||
Reference in New Issue
Block a user