From e2933789225efded9eb2b8e8a5c1ad0f6e47abe8 Mon Sep 17 00:00:00 2001 From: Lilian Roller Date: Tue, 16 Jul 2019 16:53:03 +0200 Subject: [PATCH] Optimize for centos --- defaults/main.yml | 2 ++ tasks/editor.yml | 17 ++++++++++++++++- tasks/main.yml | 3 +++ tasks/os_info.yml | 4 ++++ vars/main.yml | 2 +- 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 tasks/os_info.yml diff --git a/defaults/main.yml b/defaults/main.yml index 7b5dd6e..c0a3278 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,6 +13,8 @@ add_ethz: true # we use vim! editor_is_vim: true +# print os variables +print_os_vars: false # version management submodules_versioncheck: true diff --git a/tasks/editor.yml b/tasks/editor.yml index 8cafd2b..366c0e9 100644 --- a/tasks/editor.yml +++ b/tasks/editor.yml @@ -4,4 +4,19 @@ alternatives: name: editor path: /usr/bin/vim.basic - when: editor_is_vim | bool + when: + - editor_is_vim | bool + - ansible_distribution != 'CentOS' + - ansible_distribution != 'RedHat' + ignore_errors: yes + +- name: vim is our editor + become: true + alternatives: + name: editor + path: /usr/bin/vim + when: + - editor_is_vim | bool + - ansible_distribution == 'CentOS' + - ansible_distribution == 'RedHat' + ignore_errors: yes diff --git a/tasks/main.yml b/tasks/main.yml index 5969677..e7b8a59 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,4 +1,7 @@ --- +- include_tasks: os_info.yml + when: print_os_vars | bool + - include_tasks: versioncheck.yml when: submodules_versioncheck | bool diff --git a/tasks/os_info.yml b/tasks/os_info.yml new file mode 100644 index 0000000..0f12047 --- /dev/null +++ b/tasks/os_info.yml @@ -0,0 +1,4 @@ +--- + - name: Print OS Infos + debug: + msg: " ansible_os_family = '{{ ansible_os_family }}'\n ansible_distribution = '{{ ansible_distribution }}'\n\n\n ansible_hostname = '{{ ansible_hostname }}'\n ansible_fqdn = '{{ ansible_fqdn }}'\n" diff --git a/vars/main.yml b/vars/main.yml index 3347d63..e213424 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -47,5 +47,5 @@ fedora_packages: - python3-pip - python3 -playbook_version_number: 8959 # should be over ninethousand +playbook_version_number: 8961 # should be over ninethousand playbook_version_path: '/etc/ansible-version/base-packages_ffbsee_or_chaos-bodensee_github.version'