From b208b8426dbf45cb92df1678d7735e4c4135a7e4 Mon Sep 17 00:00:00 2001
From: Sean Mooney <sean.k.mooney@intel.com>
Date: Wed, 18 May 2016 23:24:11 +0100
Subject: [PATCH] introduce install_dib varible

- This change introduces a new install_dib varible.
- This change decouples installation of disk image
  builder and dib-utils form building a dib image.
- To maintain backwards compatiblity install_dib
  default to the value of create_image_via_dib

Change-Id: I06fb4a2df73702f06393c552f6ba9f705a4eb994
---
 playbooks/roles/bifrost-ironic-install/defaults/main.yml    | 2 ++
 playbooks/roles/bifrost-ironic-install/tasks/main.yml       | 4 ++--
 .../notes/introduce-install-dib-1e53da734a878dac.yaml       | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/introduce-install-dib-1e53da734a878dac.yaml

diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
index 88328c9cf..199be8d0f 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
@@ -10,6 +10,8 @@ ironicclient_source_install: false
 shade_source_install: true
 # Setting to utilize diskimage-builder to create a bootable image.
 create_image_via_dib: true
+# Setting to install diskimage-builder
+install_dib: "{{ create_image_via_dib }}"
 # Setting to prepend a partition image with a boot sector and partition table.
 transform_boot_image: false
 # If testing is true, then the environment is setup for using libvirt
diff --git a/playbooks/roles/bifrost-ironic-install/tasks/main.yml b/playbooks/roles/bifrost-ironic-install/tasks/main.yml
index 641f96e02..86664eb75 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/main.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/main.yml
@@ -90,13 +90,13 @@
   include: pip_install.yml
     package=dib-utils
     state=present
-  when: skip_install is not defined and create_image_via_dib == true
+  when: skip_install is not defined and install_dib == true
 - name: "Diskimage-builder - Install"
   include: pip_install.yml
     package=diskimage-builder
     sourcedir={{ dib_git_folder }}
     source_install=true
-  when: skip_install is not defined and create_image_via_dib == true
+  when: skip_install is not defined and install_dib == true
 - name: "Ironic Client - Install"
   include: pip_install.yml
     package=python-ironicclient
diff --git a/releasenotes/notes/introduce-install-dib-1e53da734a878dac.yaml b/releasenotes/notes/introduce-install-dib-1e53da734a878dac.yaml
new file mode 100644
index 000000000..e094570e3
--- /dev/null
+++ b/releasenotes/notes/introduce-install-dib-1e53da734a878dac.yaml
@@ -0,0 +1,6 @@
+---
+other:
+  - A new install_dib varible has been introduced to the ironic install role
+    to control installation of disk image builder and dib-utils. 
+    To maintain  the previous behavior install_dib will default to
+    the value of create_image_via_dib.