openstack/fuel-main
Code Issues Proposed changes

late.seed modified in iso2

Browse Source
This commit is contained in:
Vladimir Kozhukalov 2012-06-05 15:07:28 +04:00
parent f920196778
commit bcfd8e8420
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
iso2/isobuild.sh
View File

@ -53,6 +53,7 @@ SECTIONS="main restricted universe multiverse"
BOOTSTRAPDIR=${BASEDIR}/bootstrap
EGGSDIR=${BASEDIR}/eggs
GEMSDIR=${BASEDIR}/gems
###########################
@ -76,8 +77,8 @@ rm -rf ${NEW}
echo "Removing ${INDICES} ..."
rm -rf ${INDICES}
echo "Removing ${EXTRAS} ..."
rm -rf ${EXTRAS}
#echo "Removing ${EXTRAS} ..."
#rm -rf ${EXTRAS}
echo "Removing ${TMPGNUPG} ..."
rm -rf ${TMPGNUPG}
@ -370,6 +371,8 @@ GNUPGHOME=${TMPGNUPG} gpg --yes --no-tty --default-key ${GPGKEYID} \
# DOWNLOADING BOOTSTRAP
###########################
echo "Downloading bootstrap kernel and miniroot ..."
echo "BOOTSTRAP_KERNEL_URL=${BOOTSTRAP_KERNEL_URL}"
echo "BOOTSTRAP_INITRD_URL=${BOOTSTRAP_INITRD_URL}"
mkdir -p ${BOOTSTRAPDIR}
wget -qO- ${BOOTSTRAP_KERNEL_URL} > ${BOOTSTRAPDIR}/linux
wget -qO- ${BOOTSTRAP_INITRD_URL} > ${BOOTSTRAPDIR}/initrd.gz
@ -383,7 +386,18 @@ echo "Downloading python eggs ..."
# It is very ugly to just copy directory with eggs into disk
# It is nice to have beautiful way to download eggs with there dependencies
mkdir -p ${EGGSDIR}
cp /var/tmp/eggs/* ${EGGSDIR}
rsync -av /var/tmp/eggs/ ${EGGSDIR}
###########################
# DOWNLOADING RUBY GEMS
###########################
echo "Downloading ruby gems ..."
# FIXME:
# It is very ugly to just copy directory with gems into disk
# It is nice to have beautiful way to download gems with there dependencies
mkdir -p ${GEMSDIR}
rsync -av /var/tmp/gems/ ${GEMSDIR}
###########################
@ -399,11 +413,15 @@ cp ${REPO}/scripts/solo.rb ${NEW}/inject/scripts
cp ${REPO}/scripts/solo.cron ${NEW}/inject/scripts
cp ${REPO}/scripts/solo.rc.local ${NEW}/inject/scripts
cp -r ${REPO}/gnupg ${NEW}/inject/gnupg
cp -r ${REPO}/nailgun ${NEW}/inject
mkdir -p ${NEW}/bootstrap
cp ${BOOTSTRAPDIR}/linux ${NEW}/bootstrap/linux
cp ${BOOTSTRAPDIR}/initrd.gz ${NEW}/bootstrap/initrd.gz
mkdir -p ${NEW}/eggs
cp ${EGGSDIR}/* ${NEW}/eggs
rsync -av ${EGGSDIR}/ ${NEW}/eggs
mkdir -p ${NEW}/gems
rsync -av ${GEMSDIR}/ ${NEW}/gems
###########################
# MAKE NEW ISO

5
iso2/stage/preseed/late.seed
View File

@ -13,6 +13,11 @@ cp /cdrom/bootstrap/linux /target/var/lib/mirror/bootstrap/linux && \
cp /cdrom/bootstrap/initrd.gz /target/var/lib/mirror/bootstrap/initrd.gz && \
# eggs
cp -r /cdrom/eggs /target/var/lib/mirror && \
# gems
cp -r /cdrom/gems /target/var/lib/mirror && \
# nailgun
mkdir -p /target/opt && \
cp -r /cdrom/inject/nailgun /target/opt && \
# chef
cp -r /cdrom/inject/cookbooks /target/root && \
mkdir -p /target/root/scripts && \

6
iso2/stage/preseed/static.seed
View File

@ -1,8 +1,8 @@
d-i netcfg/disable_autoconfig boolean true
d-i netcfg/get_nameservers string 192.168.0.1
d-i netcfg/get_ipaddress string 192.168.0.2
d-i netcfg/get_nameservers string 10.20.0.1
d-i netcfg/get_ipaddress string 10.20.0.2
d-i netcfg/get_netmask string 255.255.255.0
d-i netcfg/get_gateway string 192.168.0.1
d-i netcfg/get_gateway string 10.20.0.1
d-i netcfg/confirm_static boolean true
d-i preseed/include string common.seed