Don't download packages which are already on ISO

It is not necessary to create local mirrors with mos-ubuntu packages for
our purpose. These packages are already included on ISO, we only need
these from ubuntu upstream repositories.

Change-Id: I26d88019981b32e7fdb69a0a608a910bbe4d623a
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit f126512730bc9a6f434ac5b9f6395bfc4b5dc960)

diff --git a/build/f_isoroot/f_odlpluginbuild/packages.yaml b/build/f_isoroot/f_odlpluginbuild/packages.yaml
index f4036fd..8d67d39 100644 (file)
--- 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 105efa3..27eb05e 100644 (file)
--- 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 28f6427..aa12c45 100644 (file)
--- 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"