diff options
| author |   Michal Skalski <mskalski@mirantis.com> | 2016-01-28 15:28:07 +0100 |
|---|---|---|
| committer | Michal Skalski <mskalski@mirantis.com> | 2016-01-29 10:26:08 +0100 |
| commit | f595c31b29147efb1410756b491ff7bf48d256ec (patch) | |
| tree | fa80af3db1c189321717b458ac650fd44edb3af9 /build/f_isoroot/f_bootstrap | |
| parent | 108cdaacf2e3cc1febabc10cead78b1120e9156b (diff) | |
Create local mirrors for offline installation
- switch to fuel-mirror [1]
- plugin developers can create packages.yaml
file with names of required packages
- use custom configuration for fuel-bootstrap
which always point to local repositories
- delay process of bootstrap image creation until
mirrors will be ready
[1] https://github.com/openstack/fuel-mirror
Change-Id: Ie4a47c8cc13d9ded8c6b5fe48cdcbfeb1f6277a4
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Diffstat (limited to 'build/f_isoroot/f_bootstrap')
| -rwxr-xr-x | build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh | 19 | ||||
| -rwxr-xr-x | build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh | 5 |
2 files changed, 15 insertions, 9 deletions
diff --git a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh index a5ca56c64..b096a7812 100755 --- a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh +++ b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh @@ -414,6 +414,16 @@ rmdir /var/log/remote && ln -s /var/log/docker-logs/remote /var/log/remote dockerctl check || fail bash /etc/rc.local +### OPNFV addition BEGIN +shopt -s nullglob +for script in /opt/opnfv/bootstrap/post.d/*.sh +do + echo "Post script: $script" >> /root/post.log 2>&1 + $script >> /root/post.log 2>&1 +done +shopt -u nullglob +### OPNFV addition END + if [ "`get_bootstrap_flavor`" = "ubuntu" ]; then if [ "`get_bootstrap_skip`" = "False" ]; then build_ubuntu_bootstrap bs_status || true @@ -426,15 +436,6 @@ else bs_status=3 fi -### OPNFV addition BEGIN -shopt -s nullglob -for script in /opt/opnfv/bootstrap/post.d/*.sh -do - echo "Post script: $script" >> /root/post.log 2>&1 - $script >> /root/post.log 2>&1 -done -shopt -u nullglob -### OPNFV addition END # Enable updates repository cat > /etc/yum.repos.d/mos${FUEL_RELEASE}-updates.repo << EOF diff --git a/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh b/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh index 427a55add..8dad89397 100755 --- a/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh +++ b/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh @@ -16,4 +16,9 @@ if [ $? -ne 0 ]; then echo "Error removing /opt/opnfv/nailgun directory!" exit 1 fi +mv /opt/opnfv/fuel_bootstrap_cli.yaml /etc/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml +if [ $? -ne 0 ]; then + echo "Error moving bootstrap image configuration!" + exit 1 +fi echo "Done installing pre-build repo" |