From dc6ad64ec75271cb6d48f7d29c216cb05b2c11c9 Mon Sep 17 00:00:00 2001
From: Vitaliy Dmitriev <vi7alya@gmail.com>
Date: Thu, 1 Aug 2019 13:00:16 +0200
Subject: [PATCH] [contrib/heketi]: tear down additions and fixes. Heketi
updated to version 9 (#5027)
* lvm packages removal during tear down skipped by default
* lvm utils execution PATH fixed for CentOS/RH
* Heketi updated to the latest version 9
Signed-off-by: Vitaliy Dmitriev <vi7alya@gmail.com>
---
contrib/network-storage/heketi/README.md | 2 ++
.../roles/provision/templates/heketi-bootstrap.json.j2 | 2 +-
.../provision/templates/heketi-deployment.json.j2 | 2 +-
.../heketi/roles/tear-down-disks/defaults/main.yml | 2 ++
.../heketi/roles/tear-down-disks/tasks/main.yml | 10 ++++++++--
5 files changed, 14 insertions(+), 4 deletions(-)
create mode 100644 contrib/network-storage/heketi/roles/tear-down-disks/defaults/main.yml
diff --git a/contrib/network-storage/heketi/README.md b/contrib/network-storage/heketi/README.md
index aa1b656e5..fb67a43d7 100644
--- a/contrib/network-storage/heketi/README.md
+++ b/contrib/network-storage/heketi/README.md
@@ -14,3 +14,5 @@ ansible-playbook --ask-become -i inventory/sample/k8s_heketi_inventory.yml contr
```
ansible-playbook --ask-become -i inventory/sample/k8s_heketi_inventory.yml contrib/network-storage/heketi/heketi-tear-down.yml
```
+
+Add `--extra-vars "heketi_remove_lvm=true"` to the command above to remove LVM packages from the system
diff --git a/contrib/network-storage/heketi/roles/provision/templates/heketi-bootstrap.json.j2 b/contrib/network-storage/heketi/roles/provision/templates/heketi-bootstrap.json.j2
index 43048c6b6..764de5efa 100644
--- a/contrib/network-storage/heketi/roles/provision/templates/heketi-bootstrap.json.j2
+++ b/contrib/network-storage/heketi/roles/provision/templates/heketi-bootstrap.json.j2
@@ -56,7 +56,7 @@
"serviceAccountName": "heketi-service-account",
"containers": [
{
- "image": "heketi/heketi:7",
+ "image": "heketi/heketi:9",
"imagePullPolicy": "Always",
"name": "deploy-heketi",
"env": [
diff --git a/contrib/network-storage/heketi/roles/provision/templates/heketi-deployment.json.j2 b/contrib/network-storage/heketi/roles/provision/templates/heketi-deployment.json.j2
index 247f1fd9d..cd7466ae5 100644
--- a/contrib/network-storage/heketi/roles/provision/templates/heketi-deployment.json.j2
+++ b/contrib/network-storage/heketi/roles/provision/templates/heketi-deployment.json.j2
@@ -68,7 +68,7 @@
"serviceAccountName": "heketi-service-account",
"containers": [
{
- "image": "heketi/heketi:7",
+ "image": "heketi/heketi:9",
"imagePullPolicy": "Always",
"name": "heketi",
"env": [
diff --git a/contrib/network-storage/heketi/roles/tear-down-disks/defaults/main.yml b/contrib/network-storage/heketi/roles/tear-down-disks/defaults/main.yml
new file mode 100644
index 000000000..c07ba2d23
--- /dev/null
+++ b/contrib/network-storage/heketi/roles/tear-down-disks/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+heketi_remove_lvm: false
diff --git a/contrib/network-storage/heketi/roles/tear-down-disks/tasks/main.yml b/contrib/network-storage/heketi/roles/tear-down-disks/tasks/main.yml
index c18169694..9ace96e62 100644
--- a/contrib/network-storage/heketi/roles/tear-down-disks/tasks/main.yml
+++ b/contrib/network-storage/heketi/roles/tear-down-disks/tasks/main.yml
@@ -14,6 +14,8 @@
when: "ansible_os_family == 'Debian'"
- name: "Get volume group information."
+ environment:
+ PATH: "{{ ansible_env.PATH }}:/sbin" # Make sure we can workaround RH / CentOS conservative path management
become: true
shell: "pvs {{ disk_volume_device_1 }} --option vg_name | tail -n+2"
register: "volume_groups"
@@ -21,12 +23,16 @@
changed_when: false
- name: "Remove volume groups."
+ environment:
+ PATH: "{{ ansible_env.PATH }}:/sbin" # Make sure we can workaround RH / CentOS conservative path management
become: true
command: "vgremove {{ volume_group }} --yes"
with_items: "{{ volume_groups.stdout_lines }}"
loop_control: { loop_var: "volume_group" }
- name: "Remove physical volume from cluster disks."
+ environment:
+ PATH: "{{ ansible_env.PATH }}:/sbin" # Make sure we can workaround RH / CentOS conservative path management
become: true
command: "pvremove {{ disk_volume_device_1 }} --yes"
ignore_errors: true
@@ -36,11 +42,11 @@
yum:
name: "lvm2"
state: "absent"
- when: "ansible_os_family == 'RedHat'"
+ when: "ansible_os_family == 'RedHat' and heketi_remove_lvm"
- name: "Remove lvm utils (Debian)"
become: true
apt:
name: "lvm2"
state: "absent"
- when: "ansible_os_family == 'Debian'"
+ when: "ansible_os_family == 'Debian' and heketi_remove_lvm"
--
GitLab