From 437b4ee932461797caee1e70be30300ffbedddb7 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 20 Nov 2014 09:31:53 -0800
Subject: [PATCH] Set dib vars to override tmp and cache locations

We need to override the locations of tmp and DIB cache to take advantage
of ephemeral disks on cloud nodes. DIB requires many gigabytes of
storage in our use of the tool and many cloud VMs simply do not provide
that on the root filesystem.

In our specific case we mount the ephemeral drive on /opt so we use
/opt/dib_cache and /opt/dib_tmp as the new locations for these
directories when running DIB.

Change-Id: Id126d3e63a518886c8047684ae14e891f6fdad99
---
 modules/nodepool/manifests/init.pp             | 18 ++++++++++++++++++
 .../templates/nodepool/nodepool.yaml.erb       | 15 +++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/modules/nodepool/manifests/init.pp b/modules/nodepool/manifests/init.pp
index 63066a9ee3..685eea0be1 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -179,6 +179,24 @@ class nodepool (
     require => User['nodepool'],
   }
 
+  # used for storage of d-i-b cached data
+  file { '/opt/dib_cache':
+    ensure  => directory,
+    mode    => '0755',
+    owner   => 'nodepool',
+    group   => 'nodepool',
+    require => User['nodepool'],
+  }
+
+  # used as TMPDIR during d-i-b image builds
+  file { '/opt/dib_tmp':
+    ensure  => directory,
+    mode    => '0755',
+    owner   => 'nodepool',
+    group   => 'nodepool',
+    require => User['nodepool'],
+  }
+
   file { '/var/log/nodepool':
     ensure  => directory,
     mode    => '0755',
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 47000752a2..5d4d615f79 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -1095,6 +1095,9 @@ diskimages:
       - nodepool-base
       - node-devstack
     release: trusty
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
   - name: devstack-precise-dib
     elements:
       - ubuntu
@@ -1104,6 +1107,9 @@ diskimages:
       - nodepool-base
       - node-devstack
     release: precise
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
   - name: devstack-centos7-dib
     elements:
       - centos7
@@ -1112,6 +1118,9 @@ diskimages:
       - puppet
       - nodepool-base
       - node-devstack
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
   - name: devstack-fedora21-dib
     elements:
       - fedora
@@ -1121,5 +1130,7 @@ diskimages:
       - node-devstack
     release: 21
     env-vars:
-      - DIB_CLOUD_IMAGES: http://download.fedoraproject.org/pub/fedora/linux/releases/test/21-Beta/Cloud/Images/x86_64/
-      - BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_CLOUD_IMAGES: http://download.fedoraproject.org/pub/fedora/linux/releases/test/21-Beta/Cloud/Images/x86_64/
+      BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2