update imagefactory stuff

imagefactory/Makefile

@@ -0,0 +1,18 @@
+utility-image:
+	imagefactory --debug base_image \
+		--file-parameter install_script \
+		utility_image.ks utility_image.tdl
+
+input-image:
+	imagefactory --debug base_image \
+		--file-parameter install_script \
+		input_image.ks input_image.tdl
+
+overcloud-compute:
+	imagefactory --debug \
+		target_image \
+		--id $(INPUT_IMAGE_ID) \
+		--parameter utility_image $(UTILITY_IMAGE_ID) \
+		--file-parameter utility_customizations dib_overcloud_compute.tdl \
+		--parameter results_location "/overcloud-compute.tar" indirection
+

imagefactory/dib_overcloud_compute.tdl

@@ -7,6 +7,7 @@
    <command name="localimage">export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
 set -eux
 source /root/instack-undercloud/instack-sourcerc
+export TMP_DIR=${TMP_DIR:-/var/tmp}
 export NODE_ARCH=${NODE_ARCH:-amd64}
 export NODE_DIST=${NODE_DIST:-"fedora"}
 export DEPLOY_NAME=${DEPLOY_NAME:-deploy-ramdisk}

imagefactory/utility_image.ks.save

@@ -1,40 +0,0 @@
-url --url=http://ftp.linux.ncsu.edu/pub/fedora/linux/releases/20/Fedora/x86_64/os/
-# Without the Everything repo, we cannot install cloud-init
-repo --name="fedora-everything" --baseurl=http://ftp.linux.ncsu.edu/pub/fedora/linux/releases/20/Everything/x86_64/os/
-repo --name="testing" --baseurl=http://mirror.pnl.gov/fedora/linux/updates/20/x86_64/
-
-install
-text
-keyboard us
-lang en_US.UTF-8
-
-skipx
-
-network --device eth0 --bootproto dhcp
-rootpw ROOTPW
-firewall --disabled
-authconfig --enableshadow --enablemd5
-selinux --enforcing
-timezone --utc America/New_York
-bootloader --location=mbr --append="console=tty0 console=ttyS0,115200"
-zerombr
-clearpart --all --drives=vda
-
-part biosboot --fstype=biosboot --size=1
-part /boot --fstype ext4 --size=200 --ondisk=vda
-part pv.2 --size=1 --grow --ondisk=vda
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
-reboot
-
-%post
-git clone https://github.com/agroup/instack-undercloud /root/instack-undercloud
-%end
-
-%packages
-@core
-diskimage-builder
-git
-%end
-

imagefactory/utility_image.tdl

@@ -9,7 +9,7 @@
     </install>
   </os>
   <disk>
-    <size>20</size>
+    <size>40</size>
   </disk>
   <description>Fedora 20 JEOS Image</description>
 </template>