[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>
This commit is contained in:
Vitaliy Dmitriev 2019-08-01 13:00:16 +02:00 committed by Kubernetes Prow Robot
parent 92bfcf0467
commit dc6ad64ec7
5 changed files with 14 additions and 4 deletions

View file

@ -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 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

View file

@ -56,7 +56,7 @@
"serviceAccountName": "heketi-service-account", "serviceAccountName": "heketi-service-account",
"containers": [ "containers": [
{ {
"image": "heketi/heketi:7", "image": "heketi/heketi:9",
"imagePullPolicy": "Always", "imagePullPolicy": "Always",
"name": "deploy-heketi", "name": "deploy-heketi",
"env": [ "env": [

View file

@ -68,7 +68,7 @@
"serviceAccountName": "heketi-service-account", "serviceAccountName": "heketi-service-account",
"containers": [ "containers": [
{ {
"image": "heketi/heketi:7", "image": "heketi/heketi:9",
"imagePullPolicy": "Always", "imagePullPolicy": "Always",
"name": "heketi", "name": "heketi",
"env": [ "env": [

View file

@ -0,0 +1,2 @@
---
heketi_remove_lvm: false

View file

@ -14,6 +14,8 @@
when: "ansible_os_family == 'Debian'" when: "ansible_os_family == 'Debian'"
- name: "Get volume group information." - name: "Get volume group information."
environment:
PATH: "{{ ansible_env.PATH }}:/sbin" # Make sure we can workaround RH / CentOS conservative path management
become: true become: true
shell: "pvs {{ disk_volume_device_1 }} --option vg_name | tail -n+2" shell: "pvs {{ disk_volume_device_1 }} --option vg_name | tail -n+2"
register: "volume_groups" register: "volume_groups"
@ -21,12 +23,16 @@
changed_when: false changed_when: false
- name: "Remove volume groups." - name: "Remove volume groups."
environment:
PATH: "{{ ansible_env.PATH }}:/sbin" # Make sure we can workaround RH / CentOS conservative path management
become: true become: true
command: "vgremove {{ volume_group }} --yes" command: "vgremove {{ volume_group }} --yes"
with_items: "{{ volume_groups.stdout_lines }}" with_items: "{{ volume_groups.stdout_lines }}"
loop_control: { loop_var: "volume_group" } loop_control: { loop_var: "volume_group" }
- name: "Remove physical volume from cluster disks." - 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 become: true
command: "pvremove {{ disk_volume_device_1 }} --yes" command: "pvremove {{ disk_volume_device_1 }} --yes"
ignore_errors: true ignore_errors: true
@ -36,11 +42,11 @@
yum: yum:
name: "lvm2" name: "lvm2"
state: "absent" state: "absent"
when: "ansible_os_family == 'RedHat'" when: "ansible_os_family == 'RedHat' and heketi_remove_lvm"
- name: "Remove lvm utils (Debian)" - name: "Remove lvm utils (Debian)"
become: true become: true
apt: apt:
name: "lvm2" name: "lvm2"
state: "absent" state: "absent"
when: "ansible_os_family == 'Debian'" when: "ansible_os_family == 'Debian' and heketi_remove_lvm"