summaryrefslogtreecommitdiff
path: root/roles/ubuntu-ws
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2019-02-02 20:34:30 +0100
committerChristian Pointner <equinox@spreadspace.org>2019-02-02 20:34:30 +0100
commitb6566ab0d55f9d97eabb1f265248a067627cbcf4 (patch)
tree1af870c3548e46a870e525ca629b9aec36656814 /roles/ubuntu-ws
parenttelesto installation for elevate (diff)
basic install of telesto for elevate works now
Diffstat (limited to 'roles/ubuntu-ws')
-rw-r--r--roles/ubuntu-ws/tasks/fs.yml12
-rw-r--r--roles/ubuntu-ws/tasks/main.yml28
2 files changed, 23 insertions, 17 deletions
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([]) }}"