git diff

diff --git a/playbooks/install.yaml b/playbooks/install.yaml
index 0fbc3c8..e7af29c 100644
--- a/playbooks/install.yaml
+++ b/playbooks/install.yaml
@@ -8,7 +8,7 @@
     - { role: bifrost-prep-for-install, when: skip_install is not defined }
     - bifrost-ironic-install
     - { role: bifrost-create-dib-image, dib_imagename: "{{ http_boot_folder }}/ipa", build_ramdisk: false, dib_os_element: "{{ ipa_dib_os_element|default('d
-    - { role: bifrost-create-dib-image, dib_imagename: "{{ deploy_image }}", dib_imagetype: "qcow2", dib_elements: "vm serial-console simple-init {{ extra_d
+    - { role: bifrost-create-dib-image, dib_imagename: "{{ deploy_image }}", dib_imagetype: "qcow2", dib_elements: "vm serial-console cloud-init-datasources
   environment:
     http_proxy: "{{ lookup('env','http_proxy') }}"
     https_proxy: "{{ lookup('env','https_proxy') }}"

diff --git a/playbooks/inventory/group_vars/baremetal b/playbooks/inventory/group_vars/baremetal
index 32e65c9..52073a6 100644
--- a/playbooks/inventory/group_vars/baremetal
+++ b/playbooks/inventory/group_vars/baremetal
@@ -5,6 +5,7 @@
 # The network interface that bifrost will be operating on.  Defaults
 # to virbr0 in roles, can be overridden here.
 # network_interface: "virbr0"
+network_interface: "eth2"

 # The path to the SSH key to be utilized for testing and burn-in
 # to configuration drives. When set, it should be set in both baremetal
diff --git a/playbooks/inventory/group_vars/localhost b/playbooks/inventory/group_vars/localhost
index 01eec7d..02fdb7e 100644
--- a/playbooks/inventory/group_vars/localhost
+++ b/playbooks/inventory/group_vars/localhost
@@ -1,10 +1,24 @@
 ---
+# Disabling the DHCP server in bifrost as we have a standalone DHCP running in
+# the setup.
+include_dhcp_server: false
+inventory_dhcp: false
+
+# inventory_dhcp: true
+# network_interface: 'eth2'
+# inventory_dhcp: true
+# dhcp_pool_start: '172.16.2.3'
+# dhcp_pool_end: '172.16.2.16'
+# dhcp_static_mask: '255.255.192.0'
+# dhcp_lease_time: 'infinite'
+# inventory_dns: true
 # The ironic API URL for bifrost operations.  Defaults to localhost.
 # ironic_url: "http://localhost:6385/"

 # The network interface that bifrost will be operating on.  Defaults
 # to virbr0 in roles, can be overridden here.
 # network_interface: "virbr0"
+network_interface: "eth2"


 # ironic_db_password ironic user password for rabbit
@@ -52,6 +66,16 @@ mysql_password:

 # Setting to utilize diskimage-builder to create a bootable image.
 create_image_via_dib: true
+dib_os_element: 'ubuntu'
+dib_os_release: 'trusty'
+dib_env_vars:
+  DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive, OpenStack"
+  ELEMENTS_PATH: "/opt/stack/diskimage-builder/elements"
+  DIB_OS_RELEASE: "trusty"
+
+# This is needed so that diskimage-builder will set it up so that it will
+# attempt to DHCP for all interfaces on the system that have a link.
+extra_dib_elements: dhcp-all-interfaces stable-interface-names

 # Transform boot image is intended for use with the Ubuntu trusty image.
 # It makes the image bootable by installing Grub.
diff --git a/tools/vagrant_dev_env/Vagrantfile b/tools/vagrant_dev_env/Vagrantfile
index d458710..8e858f8 100644
--- a/tools/vagrant_dev_env/Vagrantfile
+++ b/tools/vagrant_dev_env/Vagrantfile
@@ -9,7 +9,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

   config.vm.define 'bifrost' do |bifrost|
     bifrost.vm.provider :virtualbox do |vb|
-      vb.customize ['modifyvm', :id, '--memory', '4096', '--cpus', '1', '--cpuexecutioncap', '80']
+      vb.customize ['modifyvm', :id, '--memory', '8192', '--cpus', '8', '--cpuexecutioncap', '80']
       # the setting below are to improve performance on mac's and should have little impact elsewhere.
       vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
       vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
@@ -25,7 +25,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # the bridged interface.
     # NOTE(TheJulia): Is there a way to abstract the bridged networking...
     # NOTE(NobodyCam): until the above is  done this needs to be set to a valid interface
-    bifrost.vm.network 'public_network', bridge: ''
+    # bifrost.vm.network 'public_network', bridge: ''
+    bifrost.vm.network 'public_network', ip: '172.16.2.201', netmask: '18', bridge: 'eth0'

     # besure we get the entire bifrost directory tree
     bifrost.vm.synced_folder "../../.", "/home/vagrant/bifrost", type: "rsync"