openstack/fuel-main
Code Issues Proposed changes

[iso] Merged with master

Browse Source
This commit is contained in:
Vladimir Kozhukalov 2013-01-14 12:45:50 +04:00
parent 909ad8b37a
commit 3ffb663d78
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
iso/ks.cfg
View File

@ -165,18 +165,11 @@ fi
# Copying Repo to the nailgun /var/www directory # Copying Repo to the nailgun /var/www directory
repodir="/var/www/nailgun" repodir="/var/www/nailgun"
mkdir -p ${repodir}/centos/6.3/nailgun/x86_64 mkdir -p ${repodir}/centos/6.3/nailgun/x86_64
<<<<<<< HEAD
cp -r ${CD}/images ${repodir}/centos/6.3/nailgun/x86_64
cp -r ${CD}/isolinux ${repodir}/centos/6.3/nailgun/x86_64
cp -r ${CD}/repodata ${repodir}/centos/6.3/nailgun/x86_64
cp -r ${CD}/Packages ${repodir}/centos/6.3/nailgun/x86_64
cp ${CD}/more_rpm/MySQL-shared-5.5.28-1.el6.x86_64.rpm ${CD}/more_rpm/MySQL-client-5.5.28-1.el6.x86_64.rpm ${CD}/more_rpm/MySQL-server-5.5.28_wsrep_23.7-1.rhel5.x86_64.rpm ${CD}/more_rpm/galera-23.2.2-1.rhel5.x86_64.rpm ${repodir}
=======
cp -r ${SOURCE}/images ${repodir}/centos/6.3/nailgun/x86_64 cp -r ${SOURCE}/images ${repodir}/centos/6.3/nailgun/x86_64
cp -r ${SOURCE}/isolinux ${repodir}/centos/6.3/nailgun/x86_64 cp -r ${SOURCE}/isolinux ${repodir}/centos/6.3/nailgun/x86_64
cp -r ${SOURCE}/repodata ${repodir}/centos/6.3/nailgun/x86_64 cp -r ${SOURCE}/repodata ${repodir}/centos/6.3/nailgun/x86_64
cp -r ${SOURCE}/Packages ${repodir}/centos/6.3/nailgun/x86_64 cp -r ${SOURCE}/Packages ${repodir}/centos/6.3/nailgun/x86_64
>>>>>>> Removed usbks.cfg in order to get rid kickstart code duplication cp ${SOURCE}/more_rpm/MySQL-shared-5.5.28-1.el6.x86_64.rpm ${SOURCE}/more_rpm/MySQL-client-5.5.28-1.el6.x86_64.rpm ${SOURCE}/more_rpm/MySQL-server-5.5.28_wsrep_23.7-1.rhel5.x86_64.rpm ${SOURCE}/more_rpm/galera-23.2.2-1.rhel5.x86_64.rpm ${repodir}
# Copying eggs/gems to the nailgun directory # Copying eggs/gems to the nailgun directory
cp -r ${SOURCE}/eggs ${repodir} cp -r ${SOURCE}/eggs ${repodir}

8
mirror/module.mk
View File

@ -238,11 +238,13 @@ else
SRC_URLS:=$(shell grep -v ^\\s*\# requirements-src.txt | sed "s=.*/\(.*\)=$(MIRROR_URL)/src/\1=") SRC_URLS:=$(shell grep -v ^\\s*\# requirements-src.txt | sed "s=.*/\(.*\)=$(MIRROR_URL)/src/\1=")
endif endif
$/src.done: $/src.done: | $(addprefix $/src/, $(notdir $(SRC_URLS)))
@mkdir -p $/src
wget --no-use-server-timestamps -c -P $/src $(SRC_URLS)
$(ACTION.TOUCH) $(ACTION.TOUCH)
$(addprefix $/src/, $(notdir $(SRC_URLS))):
@mkdir -p $/src
wget --no-use-server-timestamps -c -P $/src $(shell echo $(SRC_URLS) | grep $(notdir $@))
$/gems-bundle.done: $/gems-bundle-gemfile.done $/gems-bundle.done: $/gems-bundle-gemfile.done
( cd $/gems-bundle && bundle install --path ./ && bundle package ) ( cd $/gems-bundle && bundle install --path ./ && bundle package )
( cd $/gems-bundle/vendor/cache/ && gem fetch -v 1.2.1 bundler ) ( cd $/gems-bundle/vendor/cache/ && gem fetch -v 1.2.1 bundler )