From e68c39c424d92e5c648030fc6986a3f871fb2f3a Mon Sep 17 00:00:00 2001 From: James Slagle Date: Fri, 3 Oct 2014 14:44:42 -0400 Subject: [PATCH] ImageFactory updates to use more packages. --- imagefactory/Makefile | 12 ++++++------ imagefactory/dib_deploy_ramdisk_ironic.tdl | 17 ++--------------- imagefactory/dib_discovery_ramdisk.tdl | 17 ++--------------- imagefactory/dib_overcloud_cinder_volume.tdl | 16 ++-------------- imagefactory/dib_overcloud_compute.tdl | 16 ++-------------- imagefactory/dib_overcloud_control.tdl | 16 ++-------------- imagefactory/dib_overcloud_swift_storage.tdl | 16 ++-------------- imagefactory/utility_image.ks | 7 +++---- 8 files changed, 21 insertions(+), 96 deletions(-) diff --git a/imagefactory/Makefile b/imagefactory/Makefile index 03d4d3a99..b15757783 100644 --- a/imagefactory/Makefile +++ b/imagefactory/Makefile @@ -17,7 +17,7 @@ overcloud-control: --parameter utility_image $(UTILITY_IMAGE_ID) \ --file-parameter utility_customizations dib_overcloud_control.tdl \ --parameter results_location "/overcloud-control.tar" indirection - tar --strip-components 1 -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1) + tar -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1) overcloud-compute: imagefactory --debug \ @@ -26,7 +26,7 @@ overcloud-compute: --parameter utility_image $(UTILITY_IMAGE_ID) \ --file-parameter utility_customizations dib_overcloud_compute.tdl \ --parameter results_location "/overcloud-compute.tar" indirection - tar --strip-components 1 -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1) + tar -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1) overcloud-cinder-volume: imagefactory --debug \ @@ -35,7 +35,7 @@ overcloud-cinder-volume: --parameter utility_image $(UTILITY_IMAGE_ID) \ --file-parameter utility_customizations dib_overcloud_cinder_volume.tdl \ --parameter results_location "/overcloud-cinder-volume.tar" indirection - tar --strip-components 1 -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1) + tar -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1) overcloud-swift-storage: imagefactory --debug \ @@ -44,7 +44,7 @@ overcloud-swift-storage: --parameter utility_image $(UTILITY_IMAGE_ID) \ --file-parameter utility_customizations dib_overcloud_swift_storage.tdl \ --parameter results_location "/overcloud-swift-storage.tar" indirection - tar --strip-components 1 -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1) + tar -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1) deploy-ramdisk-ironic: imagefactory --debug \ @@ -53,7 +53,7 @@ deploy-ramdisk-ironic: --parameter utility_image $(UTILITY_IMAGE_ID) \ --file-parameter utility_customizations dib_deploy_ramdisk_ironic.tdl \ --parameter results_location "/deploy-ramdisk-ironic.tar" indirection - tar --strip-components 1 -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1) + tar -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1) discovery-ramdisk: imagefactory --debug \ @@ -62,5 +62,5 @@ discovery-ramdisk: --parameter utility_image $(UTILITY_IMAGE_ID) \ --file-parameter utility_customizations dib_discovery_ramdisk.tdl \ --parameter results_location "/discovery-ramdisk.tar" indirection - tar --strip-components 1 -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1) + tar -x -f $$(ls -1tr /var/lib/imagefactory/storage/*.body | tail -n 1) diff --git a/imagefactory/dib_deploy_ramdisk_ironic.tdl b/imagefactory/dib_deploy_ramdisk_ironic.tdl index ac48d2988..a7cd2f453 100644 --- a/imagefactory/dib_deploy_ramdisk_ironic.tdl +++ b/imagefactory/dib_deploy_ramdisk_ironic.tdl @@ -5,21 +5,8 @@ sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2 export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2 -set -eux -source /root/instack-undercloud/instack-sourcerc -export TMP_DIR=${TMP_DIR:-/var/tmp} -export TMPDIR=/var/tmp -export NODE_ARCH=${NODE_ARCH:-amd64} -export NODE_DIST=${NODE_DIST:-"fedora"} -ramdisk-image-create \ - --no-tmpfs \ - -a $NODE_ARCH \ - -o /mnt/deploy-ramdisk-ironic \ - $NODE_DIST \ - $DEPLOY_IMAGE_ELEMENT \ - $DEPLOY_DIB_EXTRA_ARGS \ - $DIB_COMMON_ELEMENTS +instack-build-images deploy-ramdisk -tar cf /mnt/deploy-ramdisk-ironic.tar /mnt/deploy-ramdisk-ironic.initramfs /mnt/deploy-ramdisk-ironic.kernel +tar cf /mnt/deploy-ramdisk-ironic.tar deploy-ramdisk-ironic.initramfs deploy-ramdisk-ironic.kernel diff --git a/imagefactory/dib_discovery_ramdisk.tdl b/imagefactory/dib_discovery_ramdisk.tdl index 0565343ea..d16d81188 100644 --- a/imagefactory/dib_discovery_ramdisk.tdl +++ b/imagefactory/dib_discovery_ramdisk.tdl @@ -5,21 +5,8 @@ sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2 export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2 -set -eux -source /root/instack-undercloud/instack-sourcerc -export TMP_DIR=${TMP_DIR:-/var/tmp} -export TMPDIR=/var/tmp -export NODE_ARCH=${NODE_ARCH:-amd64} -export NODE_DIST=${NODE_DIST:-"fedora"} -export DISCOVERY_IMAGE_ELEMENT=${DISCOVERY_IMAGE_ELEMENT:-discovery-ironic} -export DISCOVERY_NAME=${DISCOVERY_NAME:-discovery-ramdisk} -ramdisk-image-create \ - -a $NODE_ARCH \ - -o /mnt/$DISCOVERY_NAME \ - $NODE_DIST $DISCOVERY_IMAGE_ELEMENT \ - $DISCOVERY_DIB_EXTRA_ARGS \ - $DIB_COMMON_ELEMENTS +instack-build-images discovery-ramdisk -tar cf /mnt/discovery-ramdisk.tar /mnt/discovery-ramdisk.initramfs /mnt/discovery-ramdisk.kernel +tar cf /mnt/discovery-ramdisk.tar discovery-ramdisk.initramfs discovery-ramdisk.kernel diff --git a/imagefactory/dib_overcloud_cinder_volume.tdl b/imagefactory/dib_overcloud_cinder_volume.tdl index a586d3402..619500292 100644 --- a/imagefactory/dib_overcloud_cinder_volume.tdl +++ b/imagefactory/dib_overcloud_cinder_volume.tdl @@ -5,20 +5,8 @@ sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2 export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2 -set -eux -source /root/instack-undercloud/instack-sourcerc -export TMP_DIR=${TMP_DIR:-/var/tmp} -export TMPDIR=/var/tmp -export NODE_ARCH=${NODE_ARCH:-amd64} -export NODE_DIST=${NODE_DIST:-"fedora"} -disk-image-create \ - --no-tmpfs \ - -a $NODE_ARCH \ - -o /mnt/overcloud-cinder-volume \ - $NODE_DIST \ - $OVERCLOUD_CINDER_DIB_EXTRA_ARGS \ - $DIB_COMMON_ELEMENTS +instack-build-images overcloud-cinder-volume -tar cf /mnt/overcloud-cinder-volume.tar /mnt/overcloud-cinder-volume.qcow2 /mnt/overcloud-cinder-volume.vmlinuz /mnt/overcloud-cinder-volume.initrd +tar cf /mnt/overcloud-cinder-volume.tar overcloud-cinder-volume.qcow2 overcloud-cinder-volume.vmlinuz overcloud-cinder-volume.initrd diff --git a/imagefactory/dib_overcloud_compute.tdl b/imagefactory/dib_overcloud_compute.tdl index dc21279bd..2370b2ad4 100644 --- a/imagefactory/dib_overcloud_compute.tdl +++ b/imagefactory/dib_overcloud_compute.tdl @@ -5,20 +5,8 @@ sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2 export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2 -set -eux -source /root/instack-undercloud/instack-sourcerc -export TMP_DIR=${TMP_DIR:-/var/tmp} -export TMPDIR=/var/tmp -export NODE_ARCH=${NODE_ARCH:-amd64} -export NODE_DIST=${NODE_DIST:-"fedora"} -disk-image-create \ - --no-tmpfs \ - -a $NODE_ARCH \ - -o /mnt/overcloud-compute \ - $NODE_DIST \ - $OVERCLOUD_COMPUTE_DIB_EXTRA_ARGS \ - $DIB_COMMON_ELEMENTS +instack-build-images overcloud-compute -tar cf /mnt/overcloud-compute.tar /mnt/overcloud-compute.qcow2 /mnt/overcloud-compute.vmlinuz /mnt/overcloud-compute.initrd +tar cf /mnt/overcloud-compute.tar overcloud-compute.qcow2 overcloud-compute.vmlinuz overcloud-compute.initrd diff --git a/imagefactory/dib_overcloud_control.tdl b/imagefactory/dib_overcloud_control.tdl index f11d4ef5f..24e848f5b 100644 --- a/imagefactory/dib_overcloud_control.tdl +++ b/imagefactory/dib_overcloud_control.tdl @@ -5,20 +5,8 @@ sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2 export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2 -set -eux -source /root/instack-undercloud/instack-sourcerc -export TMP_DIR=${TMP_DIR:-/var/tmp} -export TMPDIR=/var/tmp -export NODE_ARCH=${NODE_ARCH:-amd64} -export NODE_DIST=${NODE_DIST:-"fedora"} -disk-image-create \ - --no-tmpfs \ - -a $NODE_ARCH \ - -o /mnt/overcloud-control \ - $NODE_DIST \ - $OVERCLOUD_CONTROL_DIB_EXTRA_ARGS \ - $DIB_COMMON_ELEMENTS +instack-build-images overcloud-control -tar cf /mnt/overcloud-control.tar /mnt/overcloud-control.qcow2 /mnt/overcloud-control.vmlinuz /mnt/overcloud-control.initrd +tar cf /mnt/overcloud-control.tar overcloud-control.qcow2 overcloud-control.vmlinuz overcloud-control.initrd diff --git a/imagefactory/dib_overcloud_swift_storage.tdl b/imagefactory/dib_overcloud_swift_storage.tdl index f3694740c..29375d99d 100644 --- a/imagefactory/dib_overcloud_swift_storage.tdl +++ b/imagefactory/dib_overcloud_swift_storage.tdl @@ -5,20 +5,8 @@ sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2 export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2 -set -eux -source /root/instack-undercloud/instack-sourcerc -export TMP_DIR=${TMP_DIR:-/var/tmp} -export TMPDIR=/var/tmp -export NODE_ARCH=${NODE_ARCH:-amd64} -export NODE_DIST=${NODE_DIST:-"fedora"} -disk-image-create \ - --no-tmpfs \ - -a $NODE_ARCH \ - -o /mnt/overcloud-swift-storage \ - $NODE_DIST \ - $OVERCLOUD_SWIFT_DIB_EXTRA_ARGS \ - $DIB_COMMON_ELEMENTS +instack-build-images overcloud-swift-storage -tar cf /mnt/overcloud-swift-storage.tar /mnt/overcloud-swift-storage.qcow2 /mnt/overcloud-swift-storage.vmlinuz /mnt/overcloud-swift-storage.initrd +tar cf /mnt/overcloud-swift-storage.tar overcloud-swift-storage.qcow2 overcloud-swift-storage.vmlinuz overcloud-swift-storage.initrd diff --git a/imagefactory/utility_image.ks b/imagefactory/utility_image.ks index 6bf7dcf83..10f941c91 100644 --- a/imagefactory/utility_image.ks +++ b/imagefactory/utility_image.ks @@ -33,11 +33,10 @@ logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow reboot %post -pushd /root -git clone https://github.com/agroup/instack-undercloud /root/instack-undercloud -source /root/instack-undercloud/instack-sourcerc +curl -o /etc/yum.repos.d/slagle-openstack-m.repo https://copr.fedoraproject.org/coprs/slagle/openstack-m/repo/fedora-20/slagle-openstack-m-fedora-20.repo +yum -y install instack-undercloud export RUN_INSTACK=0 -/root/instack-undercloud/scripts/instack-install-undercloud-source +instack-install-undercloud-source popd %end