From b6566ab0d55f9d97eabb1f265248a067627cbcf4 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 2 Feb 2019 20:34:30 +0100 Subject: basic install of telesto for elevate works now --- dan/ele-telesto.yml | 9 +++++++++ inventory/host_vars/ele-telesto.yml | 18 ++++++++++++++++++ inventory/host_vars/telesto.yml | 14 +------------- inventory/hosts.ini | 4 +--- roles/ubuntu-ws/tasks/fs.yml | 12 ++++++------ roles/ubuntu-ws/tasks/main.yml | 28 +++++++++++++++++----------- 6 files changed, 52 insertions(+), 33 deletions(-) create mode 100644 dan/ele-telesto.yml create mode 100644 inventory/host_vars/ele-telesto.yml diff --git a/dan/ele-telesto.yml b/dan/ele-telesto.yml new file mode 100644 index 00000000..8e32b606 --- /dev/null +++ b/dan/ele-telesto.yml @@ -0,0 +1,9 @@ +--- +- name: Basic Setup + hosts: ele-telesto + roles: + - role: base + - role: sshd + - role: zsh + - role: admin-user + - role: ubuntu-ws diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml new file mode 100644 index 00000000..dfa76949 --- /dev/null +++ b/inventory/host_vars/ele-telesto.yml @@ -0,0 +1,18 @@ +--- +preseed_template_name: "xubuntu-cosmic-desktop-with-raid" + +install: {} + +network: + nameservers: "{{ network_zones.lan.dns }}" + domain: "{{ host_domain }}" + primary: + interface: eno1 + ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}" + mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}" + gateway: "{{ network_zones.lan.gw }}" + +admin_user_host: +- "{{ equinox_user }}" + +ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}" diff --git a/inventory/host_vars/telesto.yml b/inventory/host_vars/telesto.yml index 585ac50e..8105a76b 100644 --- a/inventory/host_vars/telesto.yml +++ b/inventory/host_vars/telesto.yml @@ -1,20 +1,8 @@ --- -preseed_template_name: "xubuntu-cosmic-desktop-with-raid" - -install: {} - -network: - nameservers: "{{ network_zones.lan.dns }}" - domain: "{{ host_domain }}" - primary: - interface: eno1 - ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}" - mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}" - gateway: "{{ network_zones.lan.gw }}" - base_packages_extra_host: - exfat-fuse - exfat-utils +- vlan admin_user_host: - "{{ equinox_user }}" diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 6740e92e..126f707f 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -91,6 +91,7 @@ env_group=dan [elevate] ele-media host_name=media ele-router +ele-telesto host_name=telesto [elevate:children] ele-ap @@ -157,9 +158,6 @@ k8s-emc-stats ### Elevate Festival -[elevate-festival] -telesto - [elevate-festival:children] elevate k8s-emc diff --git a/roles/ubuntu-ws/tasks/fs.yml b/roles/ubuntu-ws/tasks/fs.yml index 07358b99..7a227594 100644 --- a/roles/ubuntu-ws/tasks/fs.yml +++ b/roles/ubuntu-ws/tasks/fs.yml @@ -1,26 +1,26 @@ --- - name: resize root logical volume lvol: - vg: "{{ inventory_hostname }}" + vg: "{{ hostvars[inventory_hostname].host_name }}" lv: root size: "{{ ubuntu_ws_root_fs_size }}" - name: create/resize root filesystem filesystem: fstype: ext4 - dev: "/dev/mapper/{{ inventory_hostname | replace('-', '--') }}-root" + dev: "/dev/mapper/{{ hostvars[inventory_hostname].host_name | replace('-', '--') }}-root" resizefs: yes - name: create/resize home logical volume lvol: - vg: "{{ inventory_hostname }}" + vg: "{{ hostvars[inventory_hostname].host_name }}" lv: home size: "{{ ubuntu_ws_home_fs_size }}" - name: create/resize home filesystem filesystem: fstype: ext4 - dev: "/dev/mapper/{{ inventory_hostname | replace('-', '--') }}-home" + dev: "/dev/mapper/{{ hostvars[inventory_hostname].host_name | replace('-', '--') }}-home" resizefs: yes - name: check if home is already mounted @@ -53,7 +53,7 @@ - name: temporarly mount new home filesystem mount: path: "{{ mnt_home_temp.path }}/mnt" - src: "/dev/mapper/{{ inventory_hostname | replace('-', '--') }}-home" + src: "/dev/mapper/{{ hostvars[inventory_hostname].host_name | replace('-', '--') }}-home" state: mounted fstype: ext4 fstab: "{{ mnt_home_temp.path }}/fstab" @@ -93,7 +93,7 @@ - name: mount home filesystem mount: path: /home - src: "/dev/mapper/{{ inventory_hostname | replace('-', '--') }}-home" + src: "/dev/mapper/{{ hostvars[inventory_hostname].host_name | replace('-', '--') }}-home" state: mounted fstype: ext4 opts: nodev diff --git a/roles/ubuntu-ws/tasks/main.yml b/roles/ubuntu-ws/tasks/main.yml index 04300dbd..57b17462 100644 --- a/roles/ubuntu-ws/tasks/main.yml +++ b/roles/ubuntu-ws/tasks/main.yml @@ -8,11 +8,6 @@ with_items: - flashplugin-installer -- name: install xubuntu-core task - command: "apt-get -y -q install xubuntu-core^" - args: - warn: no - - name: base packages apt: name: @@ -22,21 +17,23 @@ - exfat-fuse - exfat-utils - ntfs-3g - - gnupg-curl +# - gnupg-curl - pass - evince - geeqie - file-roller - cifs-utils + - exfat-fuse + - exfat-utils state: present - name: install browser apt: - name: "{{ item }}" + name: + - firefox + - chromium-browser state: present with_items: - - firefox - - chromium-browser - name: install multimedia stuff apt: @@ -65,12 +62,21 @@ - software-properties-common - python3-software-properties - flashplugin-installer + - network-manager + - network-manager-gnome + - network-manager-pptp + - network-manager-pptp-gnome + - ufw state: absent autoremove: yes purge: yes +- name: remove netplan config for network-manager + file: + name: /etc/netplan/01-network-manager-all.yaml + state: absent + - name: install extra packages apt: - name: "{{ item }}" + name: "{{ ubuntu_ws_extra_packages|default([]) }}" state: present - with_items: "{{ ubuntu_ws_extra_packages|default([]) }}" -- cgit v1.2.3