From 2a27db4ba802f2faf10422de32aa5939a1b6a1f4 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Sat, 27 Mar 2021 14:27:02 +0100 Subject: [PATCH 1/2] Makes installation of Ansible optional (default: no) and installs additional python libraries --- README.md | 4 +++- defaults/main.yml | 8 ++++++-- tasks/main.yml | 8 +++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3ca7ab7..b6a821a 100644 --- a/README.md +++ b/README.md @@ -12,16 +12,18 @@ Role Variables Defaults: ``` -hostname: {{ inventory_hostname }} +hostname: "{{ inventory_hostname }}" update_hostname: no locales_gen: - en_US.UTF-8 - de_DE.UTF-8 locales_default: de_DE.UTF-8 +x11_keymap: de users: - vagrant sudoers: - vagrant +enable_ansible: no # Will install a specific Ansible version on the target host ensure_ansible_version: 2.10.3 # Allow sudo with a password (applied to group sudo) diff --git a/defaults/main.yml b/defaults/main.yml index 3b7f2fd..a6f331e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,7 @@ --- # defaults file for common -hostname: '{{ inventory_hostname }}' -update_hostname: yes +hostname: "{{ inventory_hostname }}" +update_hostname: no locales_gen: - en_US.UTF-8 - de_DE.UTF-8 @@ -11,6 +11,10 @@ users: - vagrant sudoers: - vagrant +enable_ansible: no +# Will install a specific Ansible version on the target host ensure_ansible_version: 2.10.3 +# Allow sudo with a password (applied to group sudo) enable_sudo: yes +# Allow passwordless sudo (applied to group wheel) enable_passwordless_sudo: yes \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml index cd239a5..14d5ca8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -32,6 +32,8 @@ vars: packages: - python-pip + - python-setuptools + - python-virtualenv - htop - tmux become: yes @@ -44,6 +46,9 @@ #update_cache: yes vars: packages: + - python-pip + - python-setuptools + - python-virtualenv - apt-transport-https - htop - tmux @@ -52,4 +57,5 @@ - name: Install Ansible pip: - name: ansible=={{ ensure_ansible_version }} \ No newline at end of file + name: ansible=={{ ensure_ansible_version }} + when: enable_ansible \ No newline at end of file -- 2.45.3 From 044870389798ad1f65d5f7745c978e04faf7a485 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Sat, 27 Mar 2021 14:29:36 +0100 Subject: [PATCH 2/2] Fixed accidental change of default update_hostname behaviour --- README.md | 2 +- defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b6a821a..e1d11fe 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Defaults: ``` hostname: "{{ inventory_hostname }}" -update_hostname: no +update_hostname: yes locales_gen: - en_US.UTF-8 - de_DE.UTF-8 diff --git a/defaults/main.yml b/defaults/main.yml index a6f331e..fb6f250 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,7 @@ --- # defaults file for common hostname: "{{ inventory_hostname }}" -update_hostname: no +update_hostname: yes locales_gen: - en_US.UTF-8 - de_DE.UTF-8 -- 2.45.3