From 7d1a22c006c839017c754eca7932db53f9616567 Mon Sep 17 00:00:00 2001 From: Julian Gethmann Date: Tue, 7 Mar 2017 18:32:45 +0100 Subject: [PATCH] Fix a lot of incompatibilities with not tested hosts * Add missing host_vars files * Fix syntax errors * Fix Problems with Ubuntu/lab computer --- desktop.yml | 2 +- group_vars/all | 4 ++-- host_vars/las113.las.kit.edu | 1 - host_vars/las116.las.kit.edu | 6 ++++++ host_vars/las118.las.kit.edu | 6 ++++++ host_vars/las93.las.kit.edu | 5 +++++ hosts | 34 +++++++++++--------------------- roles/common/tasks/etckeeper.yml | 23 +++++++++++++++++++-- roles/common/tasks/hostname.yml | 1 + roles/common/tasks/ntp.yml | 2 +- roles/common/tasks/sshd.yml | 2 +- roles/common/tasks/sudoer.yml | 2 +- roles/common/tasks/sysupdate.yml | 2 +- roles/common/tasks/yumrepos.yml | 2 ++ 14 files changed, 60 insertions(+), 32 deletions(-) create mode 100644 host_vars/las116.las.kit.edu create mode 100644 host_vars/las118.las.kit.edu create mode 100644 host_vars/las93.las.kit.edu diff --git a/desktop.yml b/desktop.yml index 0391cb1..5bb56a3 100644 --- a/desktop.yml +++ b/desktop.yml @@ -4,4 +4,4 @@ become: yes when: ansible_distribution == 'Fedora' with_items: - - desktop_software + - "{{desktop_software}}" diff --git a/group_vars/all b/group_vars/all index 1249549..694813b 100644 --- a/group_vars/all +++ b/group_vars/all @@ -36,11 +36,11 @@ python_software: desktop_software: - thunderbird - # - king/Clipboard - # - dagolden/Capture-Tiny - firefox - libreoffice - bwSyncAndShare + - perl-Clipboard + - perl-Capture-Tiny ipaserver: las101.las.kit.edu ipaserver2: las126.las.kit.edu diff --git a/host_vars/las113.las.kit.edu b/host_vars/las113.las.kit.edu index e3fff30..a6713c3 100644 --- a/host_vars/las113.las.kit.edu +++ b/host_vars/las113.las.kit.edu @@ -1,4 +1,3 @@ -ansible_connection: local ansible_user: gethmann user_account: gethmann ip_suffix: 113 diff --git a/host_vars/las116.las.kit.edu b/host_vars/las116.las.kit.edu new file mode 100644 index 0000000..e5383cc --- /dev/null +++ b/host_vars/las116.las.kit.edu @@ -0,0 +1,6 @@ +ansible_connection: local +ansible_user: gethmann +user_account: widmann +ip_suffix: 116 +loc: 618 +os: Fedora 24 diff --git a/host_vars/las118.las.kit.edu b/host_vars/las118.las.kit.edu new file mode 100644 index 0000000..4e07897 --- /dev/null +++ b/host_vars/las118.las.kit.edu @@ -0,0 +1,6 @@ +ansible_connection: local +ansible_user: gethmann +user_account: blomley +ip_suffix: 118 +loc: 620 +os: Fedora 25 diff --git a/host_vars/las93.las.kit.edu b/host_vars/las93.las.kit.edu new file mode 100644 index 0000000..b42c729 --- /dev/null +++ b/host_vars/las93.las.kit.edu @@ -0,0 +1,5 @@ +ansible_user: gethmann +user_account: bernhard +ip_suffix: 93 +loc: -10. +os: ubuntu diff --git a/hosts b/hosts index f11d1ef..909db16 100644 --- a/hosts +++ b/hosts @@ -1,15 +1,15 @@ # stable [las-archiv1] las113.las.kit.edu -las111.las.kit.edu +# las111.las.kit.edu las93.las.kit.edu las-gethmann.las.kit.edu [opera] las113.las.kit.edu -las114.las.kit.edu +# las114.las.kit.edu las-bernhard.anka.kit.edu -las111.las.kit.edu +# las111.las.kit.edu las118.las.kit.edu las117.las.kit.edu las126.las.kit.edu @@ -18,7 +18,7 @@ las-gethmann.las.kit.edu [elegant] las113.las.kit.edu las117.las.kit.edu -las111.las.kit.edu +# las111.las.kit.edu las126.las.kit.edu las-gethmann.las.kit.edu @@ -30,9 +30,9 @@ las113.las.kit.edu las-gethmann.las.kit.edu [clients] -las111.las.kit.edu -127.0.0.1 -las114.las.kit.edu +# las111.las.kit.edu +# 127.0.0.1 +# las114.las.kit.edu las116.las.kit.edu las118.las.kit.edu las113.las.kit.edu @@ -40,9 +40,9 @@ las93.las.kit.edu las-gethmann.las.kit.edu [desktop] -las111.las.kit.edu +# las111.las.kit.edu las113.las.kit.edu -las114.las.kit.edu +# las114.las.kit.edu las116.las.kit.edu las118.las.kit.edu las-gethmann.las.kit.edu @@ -52,23 +52,13 @@ las-gethmann.las.kit.edu # semi stable [scipy] -las114.las.kit.edu +# las114.las.kit.edu las113.las.kit.edu -las111.las.kit.edu +# las111.las.kit.edu las126.las.kit.edu -# testing -[alle] -las101.las.kit.edu -las111.las.kit.edu -las113.las.kit.edu -las114.las.kit.edu -las118.las.kit.edu -las126.las.kit.edu -las-bernhard.anka.kit.edu - [local] -127.0.0.1 ansible_connection=local +# 127.0.0.1 ansible_connection=local [admin-pcs] las113.las.kit.edu diff --git a/roles/common/tasks/etckeeper.yml b/roles/common/tasks/etckeeper.yml index f788358..e5544f8 100644 --- a/roles/common/tasks/etckeeper.yml +++ b/roles/common/tasks/etckeeper.yml @@ -1,8 +1,7 @@ --- -# not tested yet - name: install etckeeper become: yes - dnf: name=etckeeper state=installed + package: name=etckeeper state=installed - name: Initialise etckeeper tags: etckeeper @@ -12,3 +11,23 @@ - name: dnf as package manager lineinfile: dest=/etc/etckeeper/etckeeper.conf line="HIGHLEVEL_PACKAGE_MANAGER=dnf" regexp="HIGHLEVEL_PACKAGE_MANAGER=.*" backup=yes become: yes + when: (ansible_distribution == "Fedora" and ansible_distribution_major_version >= "18") + +- name: yum as package manager + lineinfile: dest=/etc/etckeeper/etckeeper.conf line="HIGHLEVEL_PACKAGE_MANAGER=yum" regexp="HIGHLEVEL_PACKAGE_MANAGER=.*" backup=yes + become: yes + when: (ansible_distribution == "CentOS" and ansible_distribution_major_version <= "7") + +- name: apt as package manager + lineinfile: dest=/etc/etckeeper/etckeeper.conf line="HIGHLEVEL_PACKAGE_MANAGER=apt" regexp="HIGHLEVEL_PACKAGE_MANAGER=.*" backup=yes + become: yes + when: ansible_os_family == "Debian" + +- name: use git + lineinfile: dest=/etc/etckeeper/etckeeper.conf line='VCS="git"' regexp='.*VCS="git"' backup=yes + become: yes + +- name: do not use bzr + lineinfile: dest=/etc/etckeeper/etckeeper.conf line='# VCS="bzr"' regexp='.*VCS="bzr"' backup=yes + become: yes + diff --git a/roles/common/tasks/hostname.yml b/roles/common/tasks/hostname.yml index 90d8c96..f4ff30e 100644 --- a/roles/common/tasks/hostname.yml +++ b/roles/common/tasks/hostname.yml @@ -14,6 +14,7 @@ - nm-connection-editor.x86_64 - libsemanage-python - policycoreutils-python + when: (ansible_distribution == "Fedora" or ansible_distribution == "CentOS") # does not work at the moment # - name: set DNS Server diff --git a/roles/common/tasks/ntp.yml b/roles/common/tasks/ntp.yml index bc8bc7a..5360b06 100644 --- a/roles/common/tasks/ntp.yml +++ b/roles/common/tasks/ntp.yml @@ -1,6 +1,6 @@ --- - name: install ntpdate - dnf: state=latest name=ntpdate + package: state=latest name=ntpdate become: yes - name: set time server diff --git a/roles/common/tasks/sshd.yml b/roles/common/tasks/sshd.yml index f72ab38..fe40203 100644 --- a/roles/common/tasks/sshd.yml +++ b/roles/common/tasks/sshd.yml @@ -1,6 +1,6 @@ --- - name: Installed sshd - dnf: state=installed name=openssh-server + package: state=installed name=openssh-server become: yes - name: Disable empty password login diff --git a/roles/common/tasks/sudoer.yml b/roles/common/tasks/sudoer.yml index b2bd352..01e0b7a 100644 --- a/roles/common/tasks/sudoer.yml +++ b/roles/common/tasks/sudoer.yml @@ -1,6 +1,6 @@ --- - name: Ensure sudo is installed - dnf: pkg=sudo state=installed + package: pkg=sudo state=installed become: yes - name: Copy sudoers file including validation diff --git a/roles/common/tasks/sysupdate.yml b/roles/common/tasks/sysupdate.yml index 24990bf..ab79cfe 100644 --- a/roles/common/tasks/sysupdate.yml +++ b/roles/common/tasks/sysupdate.yml @@ -1,4 +1,4 @@ --- - name: Updating the system become: yes - dnf: name=* state=latest + package: name=* state=latest diff --git a/roles/common/tasks/yumrepos.yml b/roles/common/tasks/yumrepos.yml index 2585897..a7a740b 100644 --- a/roles/common/tasks/yumrepos.yml +++ b/roles/common/tasks/yumrepos.yml @@ -9,6 +9,7 @@ keepalive: yes keepcache: 0 become: yes + when: (ansible_distribution == "Fedora" or ansible_distribution == "CentOS") # GPG-Key holen TODO - name: Add Adobe Reader @@ -20,4 +21,5 @@ gpgcheck: yes gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-adobe-linux become: yes + when: (ansible_distribution == "Fedora" or ansible_distribution == "CentOS") -- GitLab