diff options
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/packages.yaml | 1 | ||||
| -rw-r--r-- | build/f_isoroot/f_repobuild/Makefile | 4 | ||||
| -rw-r--r-- | build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 12 |
3 files changed, 1 insertions, 16 deletions
diff --git a/build/f_isoroot/f_odlpluginbuild/packages.yaml b/build/f_isoroot/f_odlpluginbuild/packages.yaml index f4036fd56..8d67d391e 100644 --- a/build/f_isoroot/f_odlpluginbuild/packages.yaml +++ b/build/f_isoroot/f_odlpluginbuild/packages.yaml @@ -8,4 +8,3 @@ ############################################################################## packages: - "openjdk-7-jre-headless" - - "acct" diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile index 105efa3ce..27eb05eeb 100644 --- a/build/f_isoroot/f_repobuild/Makefile +++ b/build/f_isoroot/f_repobuild/Makefile @@ -30,11 +30,9 @@ nailgun: sudo pip install ./fuel-mirror sudo pip install ./fuel-mirror/contrib/fuel_mirror ./opnfv_mirror_conf.py - sudo fuel-mirror --debug --config ./opnfv-config.yaml create --group mos ubuntu --pattern=ubuntu + sudo fuel-mirror --debug --config ./opnfv-config.yaml create --group ubuntu --pattern=ubuntu sudo chmod -R 755 /var/www/nailgun cp -Rp /var/www/nailgun . - mv nailgun/mirrors$(MIRROR_MOS_UBUNTU_ROOT) nailgun/mirrors/mos-repos/ubuntu/$(MOS_VERSION) - rmdir nailgun/mirrors/mos-repos/ubuntu/snapshots if [ "$(UBUNTU_DIR)" != "/" ]; then \ mv nailgun/mirrors$(UBUNTU_DIR)/ubuntu nailgun/mirrors/ubuntu;\ rm -rf nailgun/mirrors/$(TMP_ROOT_DIR);\ diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml index 28f6427f7..aa12c4558 100644 --- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml +++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml @@ -58,18 +58,6 @@ priority: 1050 suite: mos8.0 type: deb - - name: mos-updates - section: "main restricted" - uri: "http://127.0.0.1:8080/mirrors/mos-repos/ubuntu/8.0" - priority: 1050 - suite: mos8.0-updates - type: deb - - name: mos-security - section: "main restricted" - uri: "http://127.0.0.1:8080/mirrors/mos-repos/ubuntu/8.0" - priority: 1050 - suite: mos8.0-security - type: deb skip_default_img_build: true direct_repo_addresses: - "127.0.0.1" |