From c473915f5515eb6bb66a6ae4e8e2352dc9177654 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Thu, 4 Oct 2018 15:33:04 +0200 Subject: Reduce complexity when using bifrost roles We are using two variables which have a similar scope: - create_image_via_dib - use_prebuilt_images We could use one of them and not both. create_image_via_dib is selected because it also exists in upstream bifrost use_prebuilt_images = false is the same as create_image_via_dib = true use_prebuilt_images = true is the same as create_image_via_dib = false Change-Id: Ieaab78f1dc2d199746a2b13ebc82e9dc615d92e9 Signed-off-by: Manuel Buil --- xci/infra/bifrost/playbooks/opnfv-virtual.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'xci/infra/bifrost/playbooks') diff --git a/xci/infra/bifrost/playbooks/opnfv-virtual.yml b/xci/infra/bifrost/playbooks/opnfv-virtual.yml index 313919ba..77f4b512 100644 --- a/xci/infra/bifrost/playbooks/opnfv-virtual.yml +++ b/xci/infra/bifrost/playbooks/opnfv-virtual.yml @@ -52,7 +52,7 @@ mode: '0755' owner: 'root' group: 'root' - when: use_prebuilt_images | bool == true + when: create_image_via_dib | bool == false - name: Ensure /etc/hosts has good defaults lineinfile: create: yes @@ -101,7 +101,6 @@ when: - create_image_via_dib | bool == true - transform_boot_image | bool == false - - use_prebuilt_images | bool == false - role: bifrost-keystone-client-config clouds: bifrost: -- cgit 1.2.3-korg