From 74fb520b4a70a190470309116464b54bce776e93 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 15 Nov 2016 17:54:06 +0800 Subject: [PATCH] Move the "enable_destroy_images" into configure file TrivialFix Change-Id: I179e8bf99d406e612b6a0db096892654d1228b9f --- ansible/group_vars/all.yml | 3 +++ ansible/roles/destroy/defaults/main.yml | 2 +- etc/kolla/globals.yml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index ca2c0c5bed..a8de74b0a2 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -300,6 +300,9 @@ num_nova_fake_per_node: 5 # Monitoring options are specified here enable_collectd: "no" +# Clean images options are specified here +enable_destroy_images: "no" + #################### # Logging options #################### diff --git a/ansible/roles/destroy/defaults/main.yml b/ansible/roles/destroy/defaults/main.yml index 0d75e357de..3590870d5e 100644 --- a/ansible/roles/destroy/defaults/main.yml +++ b/ansible/roles/destroy/defaults/main.yml @@ -1,2 +1,2 @@ --- -destroy_include_images: no +destroy_include_images: "{{ enable_destroy_images }}" diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index f5c9f2adae..e1f2a96987 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -127,6 +127,7 @@ kolla_internal_vip_address: "10.10.10.254" #enable_cinder_backend_lvm: "no" #enable_cloudkitty: "no" #enable_congress: "no" +#enable_destroy_images: "no" #enable_etcd: "no" #enable_gnocchi: "no" #enable_grafana: "no"