From 3a5e225ed403df4868d3da620f91f7c2347823cc Mon Sep 17 00:00:00 2001
From: kneutron <50146127+kneutron@users.noreply.github.com>
Date: Fri, 21 Aug 2020 17:10:57 -0500
Subject: [PATCH] Update increase-swap-partition.yml

got it working in test env, had to indent evy
---
 increase-swap-partition.yml | 135 ++++++++++++++++++++++++------------
 1 file changed, 90 insertions(+), 45 deletions(-)

diff --git a/increase-swap-partition.yml b/increase-swap-partition.yml
index 3406b0e..e53fe3d 100644
--- a/increase-swap-partition.yml
+++ b/increase-swap-partition.yml
@@ -3,67 +3,110 @@
 # reboot to get new disk size
 # get info on existing swap: swapon -s
 # TURN OFF swap: swapoff -a
-# blkid|grep swap && reuse UUID so no modify fstab
+# fstab grep swap && reuse UUID so no modify fstab
 
 # NOTE this script relies on swap being on sdb1, and only 1 swap partition
 
-- name: install parted pkg if missing
-  package:
-    name: parted
-    state: present
+- hosts: testvms
+  tasks:
 
-- name: get swapinfo - partition size b4
-  shell: "swapon -s > /tmp/swapinfo.txt"
-  args:
-    creates: /tmp/swapinfo.txt
+  - name: install parted pkg if missing
+    package:
+      name: parted
+      state: present
+
+  - name: get swapinfo - partition size b4
+    shell: "swapon -s > /root/swapinfo.txt"
 
 # straight up copied from patch
-- name: reboot server to get latest disk size
-  reboot:
-    reboot_timeout: 600
-    test_command: uptime
-    post_reboot_delay: 45
+  - name: reboot server to get latest disk size
+    reboot:
+      reboot_timeout: 600
+      test_command: uptime
+      post_reboot_delay: 45
 
-- name: turn swap off
-  shell: "swapoff -a; free"
+  - name: turn swap off
+    shell: swapoff -a
 
-- name: reuse existing swap uuid
-  shell: "blkid |grep swap |head -n 1 |awk '{print $2}' > /tmp/blkidswapinfo.txt"
-  args:
-    creates: /tmp/blkidswapinfo.txt
+  - name: VERIFY swap off
+    shell: "free |awk '{print $2}' > /root/swapalloc.txt"
+    args:
+      creates: /root/swapalloc.txt
+# TODO - print $2 and fail !=0
+
+  - name: reuse existing swap uuid - get UUID from fstab instead of blkid, less trouble
+    shell: "grep swap /etc/fstab |head -n 1 |awk '{print $1}' > /root/blkidswapinfo.txt"
+#    shell: "blkid |grep swap |head -n 1 |awk '{print $2}' > /root/blkidswapinfo.txt"
+    args:
+      creates: /root/blkidswapinfo.txt
 # expected result:
-# UUID="BLAH"
+# UUID=BLAH
 
 # TODO Fail if swap not on sdb
 
-- name: delete existing swap on sdb
-  parted:
-    device: /dev/sdb
-    number: 1
-    state: absent
+  - name: delete existing swap on sdb
+    parted:
+      device: /dev/sdb
+      number: 1
+      state: absent
 
-- name: create new partition with existing blkid
-  parted:
-    device: /dev/sdb
-    number: 1
-    part_type: primary
-    part_start: 0%
-    part_end: 100%
-    state: present
+# have to shell this because parted module not support swap
+  - name: create new swap partition using all space on sdb
+    shell: "parted -s /dev/sdb mkpart primary linux-swap 1MiB 100%"
 
-- name: change partid to 82/swap
-  shell: |
-    "parted -s /dev/sdb1 print"
-    "parted -s /dev/sdb1 set swap on"
-    "parted -s /dev/sdb1 print"
+  - name: verify new partition
+    shell: "parted -s /dev/sdb1 print"
 
-- name: remake swap partition with old UUID / no fstab changes
-  shell: |
-    mkswap -U $(awk -F\" '{print $2}' /tmp/blkidswapinfo.txt)
-    "blkid |grep swap"
+#  - name: create new partition with existing blkid
+#    parted:
+#      device: /dev/sdb
+#      number: 1
+#      part_type: primary
+#      part_start: 0%
+#      part_end: 100%
+#      state: present
 
-- name: turn swap back on
-  shell: "swapon -a; swapon -s; free"
+#  - name: change partid to 82/swap
+#    shell: |
+#      "parted -s /dev/sdb1 print"
+#      "parted -s /dev/sdb1 set swap on"
+#      "parted -s /dev/sdb1 print"
+
+  - name: replace UUID=blah and get just blah
+    replace:
+      path: /root/blkidswapinfo.txt
+      regexp: "{{ item }}"
+      replace: ''
+    with_items:
+    - 'UUID='
+#    - '"'
+
+  - name: turn swap off AGAIN JIC, cuz WE WERE GETTING ERRORS THAT IT WAS STILL MOUNTED!!!
+    shell: swapoff -a
+    become: true
+
+  - name: remake swap partition with old UUID / no fstab changes
+    shell: mkswap -U $(awk '{print $1}' /root/blkidswapinfo.txt) /dev/sdb1
+
+  - name: verify swap from blkid
+    shell: "blkid |grep swap"
+
+  - name: turn swap back on
+    shell: swapon -a
+
+  - name: verify changes
+    shell: swapon -s
+    register: swaponS
+
+  - debug: 
+      msg: DEBUG {{ swaponS.stdout }}
+
+  - name: verify changes2
+    shell: free
+    register: swaponS
+
+  - debug: 
+      msg: DEBUG {{ swaponS.stdout }}
 
 # - name: cleanup
 
@@ -71,3 +114,5 @@
 # Author: dave.bechtel@asmr
 # script to delete and expand existing swap partition on sdb1
 # 2020.0820 alpha ver
+# 2020.0821 got it working in test env
+