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 | ||||
| -rw-r--r-- | deploy/config/dea_base.yaml | 24 | ||||
| -rwxr-xr-x | deploy/reap.py | 2 | ||||
| -rw-r--r-- | deploy/scenario/scenario.yaml | 2 |
6 files changed, 6 insertions, 39 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" diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml index d040b782f..1a34d819a 100644 --- a/deploy/config/dea_base.yaml +++ b/deploy/config/dea_base.yaml @@ -531,43 +531,25 @@ settings: section: main universe multiverse suite: trusty type: deb - uri: http://archive.ubuntu.com/ubuntu/ + uri: http://10.20.0.2:8080/mirrors/ubuntu/ - name: ubuntu-updates priority: null section: main universe multiverse suite: trusty-updates type: deb - uri: http://archive.ubuntu.com/ubuntu/ + uri: http://10.20.0.2:8080/mirrors/ubuntu/ - name: ubuntu-security priority: null section: main universe multiverse suite: trusty-security type: deb - uri: http://archive.ubuntu.com/ubuntu/ + uri: http://10.20.0.2:8080/mirrors/ubuntu/ - name: mos priority: 1050 section: main restricted suite: mos8.0 type: deb uri: http://10.20.0.2:8080/liberty-8.0/ubuntu/x86_64 - - name: mos-updates - priority: 1050 - section: main restricted - suite: mos8.0-updates - type: deb - uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/ - - name: mos-security - priority: 1050 - section: main restricted - suite: mos8.0-security - type: deb - uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/ - - name: mos-holdback - priority: 1100 - section: main restricted - suite: mos8.0-holdback - type: deb - uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0/ - name: Auxiliary priority: 1150 section: main restricted diff --git a/deploy/reap.py b/deploy/reap.py index dd5b242cf..bf64d405a 100755 --- a/deploy/reap.py +++ b/deploy/reap.py @@ -74,7 +74,7 @@ DHA_2 = ''' # which may not be correct - please adjust as needed. ''' -DISKS = {'fuel': '50G', +DISKS = {'fuel': '100G', 'controller': '100G', 'compute': '100G'} diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml index f6fac6632..05b889c52 100644 --- a/deploy/scenario/scenario.yaml +++ b/deploy/scenario/scenario.yaml @@ -66,7 +66,7 @@ os-nosdn-ovs-ha: configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml os-nosdn-ovs-noha: - configfile: no-ha_nfv-ovseat_ceilometer_scenario_0.0.2.yaml + configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml os-odl_l2-bgpvpn-ha: |