openstack
/
instack-undercloud
Code Issues Proposed changes

ImageFactory updates to use more packages.

This commit is contained in:
James Slagle 2014-10-03 14:44:42 -04:00
parent e39fb46b5e
commit e68c39c424
8 changed files with 21 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
imagefactory/Makefile
View File

@ -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)

17
imagefactory/dib_deploy_ramdisk_ironic.tdl
View File

@ -5,21 +5,8 @@
<command name='pty'>sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers</command>
<command name='convert'>qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
<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 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
</command>
<command name="tar">tar cf /mnt/deploy-ramdisk-ironic.tar /mnt/deploy-ramdisk-ironic.initramfs /mnt/deploy-ramdisk-ironic.kernel</command>
<command name="tar">tar cf /mnt/deploy-ramdisk-ironic.tar deploy-ramdisk-ironic.initramfs deploy-ramdisk-ironic.kernel</command>
</commands>
</template>

17
imagefactory/dib_discovery_ramdisk.tdl
View File

@ -5,21 +5,8 @@
<command name='pty'>sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers</command>
<command name='convert'>qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
<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 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
</command>
<command name="tar">tar cf /mnt/discovery-ramdisk.tar /mnt/discovery-ramdisk.initramfs /mnt/discovery-ramdisk.kernel</command>
<command name="tar">tar cf /mnt/discovery-ramdisk.tar discovery-ramdisk.initramfs discovery-ramdisk.kernel</command>
</commands>
</template>

16
imagefactory/dib_overcloud_cinder_volume.tdl
View File

@ -5,20 +5,8 @@
<command name='pty'>sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers</command>
<command name='convert'>qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
<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 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
</command>
<command name="tar">tar cf /mnt/overcloud-cinder-volume.tar /mnt/overcloud-cinder-volume.qcow2 /mnt/overcloud-cinder-volume.vmlinuz /mnt/overcloud-cinder-volume.initrd</command>
<command name="tar">tar cf /mnt/overcloud-cinder-volume.tar overcloud-cinder-volume.qcow2 overcloud-cinder-volume.vmlinuz overcloud-cinder-volume.initrd</command>
</commands>
</template>

16
imagefactory/dib_overcloud_compute.tdl
View File

@ -5,20 +5,8 @@
<command name='pty'>sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers</command>
<command name='convert'>qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
<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 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
</command>
<command name="tar">tar cf /mnt/overcloud-compute.tar /mnt/overcloud-compute.qcow2 /mnt/overcloud-compute.vmlinuz /mnt/overcloud-compute.initrd</command>
<command name="tar">tar cf /mnt/overcloud-compute.tar overcloud-compute.qcow2 overcloud-compute.vmlinuz overcloud-compute.initrd</command>
</commands>
</template>

16
imagefactory/dib_overcloud_control.tdl
View File

@ -5,20 +5,8 @@
<command name='pty'>sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers</command>
<command name='convert'>qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
<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 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
</command>
<command name="tar">tar cf /mnt/overcloud-control.tar /mnt/overcloud-control.qcow2 /mnt/overcloud-control.vmlinuz /mnt/overcloud-control.initrd</command>
<command name="tar">tar cf /mnt/overcloud-control.tar overcloud-control.qcow2 overcloud-control.vmlinuz overcloud-control.initrd</command>
</commands>
</template>

16
imagefactory/dib_overcloud_swift_storage.tdl
View File

@ -5,20 +5,8 @@
<command name='pty'>sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers</command>
<command name='convert'>qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
<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 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
</command>
<command name="tar">tar cf /mnt/overcloud-swift-storage.tar /mnt/overcloud-swift-storage.qcow2 /mnt/overcloud-swift-storage.vmlinuz /mnt/overcloud-swift-storage.initrd</command>
<command name="tar">tar cf /mnt/overcloud-swift-storage.tar overcloud-swift-storage.qcow2 overcloud-swift-storage.vmlinuz overcloud-swift-storage.initrd</command>
</commands>
</template>

7
imagefactory/utility_image.ks
View File

@ -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