summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2016-01-08 09:43:37 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2016-01-08 09:43:37 -0500
commit87d94dfb40f92e8858f15135b9484a1e27fd2e22 (patch)
tree2c87d6f1d3287be25492fb81a9cad1e9525b53af
parent98b8a3a39dbe0bd9f1d7ffda6952459bc8856f3a (diff)
parente3e4f985a28f0c9ad175b671674b3b1e185479c4 (diff)
downloadopenshift-87d94dfb40f92e8858f15135b9484a1e27fd2e22.tar.gz
openshift-87d94dfb40f92e8858f15135b9484a1e27fd2e22.tar.bz2
openshift-87d94dfb40f92e8858f15135b9484a1e27fd2e22.tar.xz
openshift-87d94dfb40f92e8858f15135b9484a1e27fd2e22.zip
Merge pull request #1122 from lhuard1A/fix_terminate_libvirt
Fix VM drive cleanup during terminate on libvirt
-rw-r--r--playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml
index 8a67d713f..397158b9e 100644
--- a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml
+++ b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml
@@ -4,13 +4,17 @@
dest: "{{ libvirt_storage_pool_path }}"
state: directory
+# We need to set permissions on the directory and any items created under the directory, so we need to call the acl module with and without default set.
- acl:
- default: yes
+ default: "{{ item }}"
entity: kvm
etype: group
name: "{{ libvirt_storage_pool_path }}"
permissions: rwx
state: present
+ with_items:
+ - no
+ - yes
- name: Test if libvirt storage pool for openshift already exists
command: "virsh -c {{ libvirt_uri }} pool-info {{ libvirt_storage_pool }}"