From 72261e8a3e2035aae8c60b78b5d47d9e9668c3eb Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 24 Oct 2020 21:33:18 +0200
Subject: remove now unneeded filesystem handling for ubuntu-ws

---
 inventory/host_vars/ch-equinox-ws.yml |  3 --
 roles/ubuntu-ws/defaults/main.yml     |  3 --
 roles/ubuntu-ws/tasks/fs.yml          | 99 -----------------------------------
 roles/ubuntu-ws/tasks/main.yml        |  2 -
 4 files changed, 107 deletions(-)
 delete mode 100644 roles/ubuntu-ws/tasks/fs.yml

diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index 085625dd..49a8e068 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -46,9 +46,6 @@ apt_repo_components:
   - universe
   - multiverse
 
-ubuntu_ws_root_fs_size: 30G
-ubuntu_ws_home_fs_size: 200G
-
 ubuntu_ws_extra_packages:
   - aisleriot
   - atftp
diff --git a/roles/ubuntu-ws/defaults/main.yml b/roles/ubuntu-ws/defaults/main.yml
index 9e549ca6..9db0c3dc 100644
--- a/roles/ubuntu-ws/defaults/main.yml
+++ b/roles/ubuntu-ws/defaults/main.yml
@@ -1,5 +1,2 @@
 ---
-ubuntu_ws_root_fs_size: 20G
-ubuntu_ws_home_fs_size: 50G
-
 ubuntu_ws_extra_packages: []
diff --git a/roles/ubuntu-ws/tasks/fs.yml b/roles/ubuntu-ws/tasks/fs.yml
deleted file mode 100644
index 7a227594..00000000
--- a/roles/ubuntu-ws/tasks/fs.yml
+++ /dev/null
@@ -1,99 +0,0 @@
----
-- name: resize root logical volume
-  lvol:
-    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/{{ hostvars[inventory_hostname].host_name | replace('-', '--') }}-root"
-    resizefs: yes
-
-- name: create/resize home logical volume
-  lvol:
-    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/{{ hostvars[inventory_hostname].host_name | replace('-', '--') }}-home"
-    resizefs: yes
-
-- name: check if home is already mounted
-  command: "mountpoint -q /home"
-  register: home_mounted
-  check_mode: False
-  failed_when: False
-  changed_when: False
-
-- name: check if there are files in /home
-  find:
-    paths: /home
-    file_type: any
-  register: home_files
-
-- name: move existing files to new filesystem
-  when: home_mounted.rc == 1 and home_files.matched != 0
-  block:
-  - name: create temporary mountpoint (1/2)
-    tempfile:
-      state: directory
-      suffix: mnt-home
-    register: mnt_home_temp
-
-  - name: create temporary mountpoint (1/2)
-    file:
-      state: directory
-      path: "{{ mnt_home_temp.path }}/mnt"
-
-  - name: temporarly mount new home filesystem
-    mount:
-      path: "{{ mnt_home_temp.path }}/mnt"
-      src: "/dev/mapper/{{ hostvars[inventory_hostname].host_name | replace('-', '--') }}-home"
-      state: mounted
-      fstype: ext4
-      fstab: "{{ mnt_home_temp.path }}/fstab"
-
-  - name: check if target fs is empty
-    find:
-      paths: "{{ mnt_home_temp.path }}/mnt"
-      file_type: any
-    register: home_files_target
-    failed_when: home_files_target.matched > 1 or (home_files_target.matched == 1 and home_files_target.files[0].path !=  mnt_home_temp.path + "/mnt/lost+found")
-
-  - name: copy all files from old /home to new filesystem
-    command: "find -maxdepth 1 -exec cp -a {} {{ mnt_home_temp.path }}/mnt/ \\;"
-    args:
-      chdir: /home
-
-  - name: remove all files from old /home
-    file:
-      path: /home
-      state: absent
-
-  - name: recreate /home mountpoint
-    file:
-      path: /home
-      state: directory
-
-  - name: umount temporarly mounted home filesystem
-    mount:
-      path: "{{ mnt_home_temp.path }}/mnt"
-      state: unmounted
-
-  - name: remove temporary mountpoint
-    file:
-      state: absent
-      path: "{{ mnt_home_temp.path }}"
-
-- name: mount home filesystem
-  mount:
-    path: /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 cdf29182..9e3b55b8 100644
--- a/roles/ubuntu-ws/tasks/main.yml
+++ b/roles/ubuntu-ws/tasks/main.yml
@@ -1,6 +1,4 @@
 ---
-- import_tasks: fs.yml
-
 - name: prohibited packages
   loop:
     - flashplugin-installer
-- 
cgit v1.2.3