From 7b7d39ebbed583bdec3ee92c9d68b604eb692ed8 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 5 Mar 2020 16:06:49 +0100 Subject: [PATCH] Remove seed_hypervisor_libvirt_pool_capacity variable This is ignored by Libvirt, so there is no need to pass it to the libvirt-host role. Note: omitting the capacity argument requires libvirt-host 1.3.1 or later. Change-Id: Id94e7b514ed36c8e042e56e8f1891d98f8371e5d Story: 2007381 Task: 38957 --- ansible/group_vars/all/seed-hypervisor | 4 ---- etc/kayobe/seed-hypervisor.yml | 3 --- .../remove-libvirt-pool-capacity-e428b893ca5bdb88.yaml | 8 ++++++++ requirements.yml | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/remove-libvirt-pool-capacity-e428b893ca5bdb88.yaml diff --git a/ansible/group_vars/all/seed-hypervisor b/ansible/group_vars/all/seed-hypervisor index 0cacd4375..c0793d58e 100644 --- a/ansible/group_vars/all/seed-hypervisor +++ b/ansible/group_vars/all/seed-hypervisor @@ -80,7 +80,6 @@ seed_hypervisor_libvirt_pools: seed_hypervisor_libvirt_pool: name: "{{ seed_hypervisor_libvirt_pool_name }}" type: dir - capacity: "{{ seed_hypervisor_libvirt_pool_capacity }}" path: "{{ seed_hypervisor_libvirt_pool_path }}" mode: "{{ seed_hypervisor_libvirt_pool_mode }}" owner: "{{ seed_hypervisor_libvirt_pool_owner }}" @@ -89,9 +88,6 @@ seed_hypervisor_libvirt_pool: # Name of the libvirt storage pool for the seed VM. seed_hypervisor_libvirt_pool_name: "default" -# Capacity of the libvirt storage pool for the seed VM. -seed_hypervisor_libvirt_pool_capacity: "{{ 75 * 2**30 }}" - # Directory path of the libvirt storage pool for the seed VM. seed_hypervisor_libvirt_pool_path: "/var/lib/libvirt/images" diff --git a/etc/kayobe/seed-hypervisor.yml b/etc/kayobe/seed-hypervisor.yml index 8f928a717..f4e2db64e 100644 --- a/etc/kayobe/seed-hypervisor.yml +++ b/etc/kayobe/seed-hypervisor.yml @@ -67,9 +67,6 @@ # Name of the libvirt storage pool for the seed VM. #seed_hypervisor_libvirt_pool_name: -# Capacity of the libvirt storage pool for the seed VM. -#seed_hypervisor_libvirt_pool_capacity: - # Directory path of the libvirt storage pool for the seed VM. #seed_hypervisor_libvirt_pool_path: diff --git a/releasenotes/notes/remove-libvirt-pool-capacity-e428b893ca5bdb88.yaml b/releasenotes/notes/remove-libvirt-pool-capacity-e428b893ca5bdb88.yaml new file mode 100644 index 000000000..2e7da8125 --- /dev/null +++ b/releasenotes/notes/remove-libvirt-pool-capacity-e428b893ca5bdb88.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + Removes the ``seed_hypervisor_libvirt_pool_capacity`` variable, which was + passed to Libvirt through the libvirt-host role when creating a storage + pool. This information is actually ignored by Libvirt, which gathers + capacity and other metadata from the storage backend. See `story 2007381 + `__ for details. diff --git a/requirements.yml b/requirements.yml index b31dbaa69..2f2a8d1e0 100644 --- a/requirements.yml +++ b/requirements.yml @@ -24,7 +24,7 @@ - src: stackhpc.grafana-conf version: 1.1.0 - src: stackhpc.libvirt-host - version: v1.3.0 + version: v1.3.1 - src: stackhpc.libvirt-vm version: v1.10.0 - src: stackhpc.mellanox-switch