diff options
Diffstat (limited to 'fuel/build/f_isoroot')
| -rw-r--r-- | fuel/build/f_isoroot/f_odlpluginbuild/Makefile | 2 | ||||
| -rw-r--r-- | fuel/build/f_isoroot/f_repobuild/Makefile | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/fuel/build/f_isoroot/f_odlpluginbuild/Makefile b/fuel/build/f_isoroot/f_odlpluginbuild/Makefile index 5b10de9b2..9d79d3531 100644 --- a/fuel/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/fuel/build/f_isoroot/f_odlpluginbuild/Makefile @@ -17,7 +17,7 @@ all: .odlbuild .PHONY: clean clean: @rm -f .odlbuild ../release/opnfv/opendaylight*.rpm opendaylight*.rpm - @rm -f $(BUILD_BASE)/gitinfo_odlplugin.txt + @rm -f $(BUILD_BASE)/gitinfo_odlplugin.txt gitinfo_odlplugin.txt .PHONY: release release:.odlbuild diff --git a/fuel/build/f_isoroot/f_repobuild/Makefile b/fuel/build/f_isoroot/f_repobuild/Makefile index 63830e7d1..d7db2dd90 100644 --- a/fuel/build/f_isoroot/f_repobuild/Makefile +++ b/fuel/build/f_isoroot/f_repobuild/Makefile @@ -10,13 +10,22 @@ SHELL := /bin/bash TOP := $(shell pwd) - RSYNC_HOST := $(shell ./select_ubuntu_repo.sh) + .PHONY: all all: nailgun nailgun: +# If RSYNC_CONNECT_PROG is set we need to do some magic to copy the +# keys. Make sure to have the username set in the SSH_CONNECT_PROG +# as well! + @if [ -n "${RSYNC_CONNECT_PROG}" -a ! -d /root/.ssh ]; then \ + sudo mkdir -p /root/.ssh; \ + test -d ${HOME}/.ssh && sudo find ${HOME}/.ssh -maxdepth 1 -type f -exec cp {} /root/.ssh \; ; \ + sudo bash -c "echo StrictHostKeyChecking=no > /root/.ssh/config"; \ + sudo chmod 700 /root/.ssh; \ + fi sudo apt-get install -y rsync python python-yaml dpkg-dev openssl rm -rf tmpiso tmpdir mkdir tmpiso @@ -27,7 +36,7 @@ nailgun: sudo dpkg -i fuel-createmirror_*.deb sudo sed -i 's/DOCKER_MODE=true/DOCKER_MODE=false/' /etc/fuel-createmirror/common.cfg sudo sed -i 's/DEBUG="no"/DEBUG="yes"/' /etc/fuel-createmirror/ubuntu.cfg - sudo sed -i 's/MIRROR_UBUNTU_HOST="archive.ubuntu.com"/MIRROR_UBUNTU_HOST="${RSYNC_HOST}"/' /etc/fuel-createmirror/common.cfg + sudo sed -i "s/MIRROR_UBUNTU_HOST=\".*\"/MIRROR_UBUNTU_HOST=\"$(RSYNC_HOST)\"/" /etc/fuel-createmirror/common.cfg rm -Rf nailgun sudo mkdir -p /var/www sudo su - -c /opt/fuel-createmirror-*/fuel-createmirror |