openstack
/
instack-undercloud
Code Issues Proposed changes

Refactor instack-build-images so that the elements included in images can be overridden

This commit is contained in:
James Slagle 2014-07-14 15:12:38 -04:00
parent 749b21e9f3
commit d2f95e980f
1 changed files with 70 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
scripts/instack-build-images
View File

@ -11,7 +11,7 @@ export NODE_ARCH=${NODE_ARCH:-amd64}
export NODE_DIST=${NODE_DIST:-"fedora"}
export DEPLOY_IMAGE_ELEMENT=${DEPLOY_IMAGE_ELEMENT:-deploy}
export ELEMENTS_PATH=/usr/share/tripleo-image-elements:/usr/share/instack-undercloud
export ELEMENTS_PATH=${ELEMENTS_PATH:-"/usr/share/tripleo-image-elements:/usr/share/instack-undercloud"}
if [ ! -f deploy-ramdisk.initramfs -o \
! -f deploy-ramdisk.kernel ]; then
@ -23,23 +23,73 @@ if [ ! -f deploy-ramdisk.initramfs -o \
2>&1 | tee dib-deploy.log
fi
export OVERCLOUD_CONTROL_DIB_EXTRA_ARGS=${OVERCLOUD_CONTROL_DIB_EXTRA_ARGS:-"\
pip-cache boot-stack cinder-api cinder-volume os-collect-config \
neutron-network-node dhcp-all-interfaces stackuser swift-proxy swift-storage \
swift-package-updates \
selinux-package-updates \
baremetal \
fedora-rdo-icehouse-repository \
horizon \
rabbitmq-server \
keystone-1289935 \
mariadb-rdo \
stable-interface-names \
os-refresh-config-reboot \
undercloud-package-install"}
export OVERCLOUD_COMPUTE_DIB_EXTRA_ARGS=${OVERCLOUD_COMPUTE_DIB_EXTRA_ARGS:-"\
pip-cache \
nova-compute \
nova-kvm \
neutron-openvswitch-agent \
os-collect-config \
selinux-package-updates \
baremetal \
dhcp-all-interfaces \
stackuser \
fedora-rdo-icehouse-repository \
stable-interface-names \
os-refresh-config-reboot \
undercloud-package-install"}
export OVERCLOUD_CINDER_DIB_EXTRA_ARGS=${OVERCLOUD_CINDER_DIB_EXTRA_ARGS:-"\
pip-cache \
cinder-volume \
neutron-openvswitch-agent \
os-collect-config \
selinux-package-updates \
baremetal \
dhcp-all-interfaces \
stackuser \
fedora-rdo-icehouse-repository \
stable-interface-names \
os-refresh-config-reboot \
undercloud-package-install \
"}
export OVERCLOUD_SWIFT_DIB_EXTRA_ARGS=${OVERCLOUD_SWIFT_DIB_EXTRA_ARGS:-"\
pip-cache \
swift-storage \
neutron-openvswitch-agent \
os-collect-config \
swift-package-updates \
selinux-package-updates \
baremetal \
dhcp-all-interfaces \
stackuser \
fedora-rdo-icehouse-repository \
stable-interface-names \
os-refresh-config-reboot \
undercloud-package-install \
"}
if [ ! -f overcloud-control.qcow2 ]; then
disk-image-create \
-a $NODE_ARCH \
-o overcloud-control \
$NODE_DIST pip-cache boot-stack cinder-api cinder-volume os-collect-config \
neutron-network-node dhcp-all-interfaces stackuser swift-proxy swift-storage \
swift-package-updates \
selinux-package-updates \
baremetal \
fedora-rdo-icehouse-repository \
horizon \
rabbitmq-server \
keystone-1289935 \
mariadb-rdo \
stable-interface-names \
os-refresh-config-reboot \
undercloud-package-install \
$NODE_DIST \
$OVERCLOUD_CONTROL_DIB_EXTRA_ARGS \
2>&1 | tee dib-overcloud-control.log
fi
@ -47,13 +97,8 @@ if [ ! -f overcloud-compute.qcow2 ]; then
disk-image-create \
-a $NODE_ARCH \
-o overcloud-compute \
$NODE_DIST pip-cache nova-compute nova-kvm neutron-openvswitch-agent os-collect-config \
selinux-package-updates \
baremetal \
dhcp-all-interfaces stackuser fedora-rdo-icehouse-repository \
stable-interface-names \
os-refresh-config-reboot \
undercloud-package-install \
$NODE_DIST \
$OVERCLOUD_COMPUTE_DIB_EXTRA_ARGS \
2>&1 | tee dib-overcloud-compute.log
fi
@ -61,13 +106,8 @@ if [ ! -f overcloud-cinder-volume.qcow2 ]; then
disk-image-create \
-a $NODE_ARCH \
-o overcloud-cinder-volume \
$NODE_DIST pip-cache cinder-volume neutron-openvswitch-agent os-collect-config \
selinux-package-updates \
baremetal \
dhcp-all-interfaces stackuser fedora-rdo-icehouse-repository \
stable-interface-names \
os-refresh-config-reboot \
undercloud-package-install \
$NODE_DIST \
$OVERCLOUD_CINDER_DIB_EXTRA_ARGS \
2>&1 | tee dib-overcloud-cinder-volume.log
fi
@ -75,14 +115,8 @@ if [ ! -f overcloud-swift-storage.qcow2 ]; then
disk-image-create \
-a $NODE_ARCH \
-o overcloud-swift-storage \
$NODE_DIST pip-cache swift-storage neutron-openvswitch-agent os-collect-config \
swift-package-updates \
selinux-package-updates \
baremetal \
dhcp-all-interfaces stackuser fedora-rdo-icehouse-repository \
stable-interface-names \
os-refresh-config-reboot \
undercloud-package-install \
$NODE_DIST \
$OVERCLOUD_SWIFT_DIB_EXTRA_ARGS
2>&1 | tee dib-overcloud-swift-storage.log
fi