diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-04-09 14:10:21 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-04-24 16:30:47 +0000 |
| commit | 603dac9a9ea3830fdf851e410ba1eced6ed32a2a (patch) | |
| tree | 9489dbd19b8e73e106f162ad4113ec7b1a980207 /build/f_repos | |
| parent | 9e78ba77a04219512bae5b0855b573ab03b6c1a5 (diff) | |
fuel-menu: Align defaults w/ OPNFV bootstrap cfg
Instead of overwriting fuel_bootstrap_cli.yaml during post-install,
with a static config which we need to manually sync in OPNFV after
each upstream change, make the whole thing dynamic by syncing (via
patch) fuel-menu's default settings with OPNFV bootstrap.
This allows us to drop the static fuel_bootstrap_cli.yaml.
JIRA: FUEL-266
Change-Id: I132f2a272c764ad0fc84b3e0e0e1222b1fab1cd2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit d116928396655b6db92b6786022ff68f13df58c7)
Diffstat (limited to 'build/f_repos')
| -rw-r--r-- | build/f_repos/patch/fuel-menu/0001-settings-OPNFV-bootstrap-Default-to-local-mirror.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/build/f_repos/patch/fuel-menu/0001-settings-OPNFV-bootstrap-Default-to-local-mirror.patch b/build/f_repos/patch/fuel-menu/0001-settings-OPNFV-bootstrap-Default-to-local-mirror.patch new file mode 100644 index 000000000..456eea7b9 --- /dev/null +++ b/build/f_repos/patch/fuel-menu/0001-settings-OPNFV-bootstrap-Default-to-local-mirror.patch @@ -0,0 +1,66 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Sun, 9 Apr 2017 13:49:28 +0200 +Subject: [PATCH] settings: OPNFV bootstrap: Default to local mirror + +JIRA: https://jira.opnfv.org/browse/FUEL-266 + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + fuelmenu/settings.yaml | 36 +++--------------------------------- + 1 file changed, 3 insertions(+), 33 deletions(-) + +diff --git a/fuelmenu/settings.yaml b/fuelmenu/settings.yaml +index e93309a..aaf07cd 100644 +--- a/fuelmenu/settings.yaml ++++ b/fuelmenu/settings.yaml +@@ -13,47 +13,17 @@ BOOTSTRAP: + http_proxy: "" + https_proxy: "" + repos: +- - name: "ubuntu" +- section: "main universe multiverse" +- uri: "http://archive.ubuntu.com/ubuntu" ++ - name: "ubuntu-local" ++ section: "main" ++ uri: "http://127.0.0.1:8080/mirrors/ubuntu" + priority: null + suite: "${codename}" + type: "deb" +- - name: "ubuntu-updates" +- section: "main universe multiverse" +- uri: "http://archive.ubuntu.com/ubuntu" +- priority: null +- suite: "${codename}-updates" +- type: "deb" +- - name: "ubuntu-security" +- section: "main universe multiverse" +- uri: "http://archive.ubuntu.com/ubuntu" +- priority: null +- suite: "${codename}-security" +- type: "deb" + - name: "mos" + section: "main restricted" + uri: "http://127.0.0.1:8080/ubuntu/x86_64" + priority: 1050 + suite: "mos${mos_version}" + type: "deb" +- - name: "mos-updates" +- section: "main restricted" +- uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/${mos_version}" +- priority: 1050 +- suite: "mos${mos_version}-updates" +- type: "deb" +- - name: "mos-security" +- section: "main restricted" +- uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/${mos_version}" +- priority: 1050 +- suite: "mos${mos_version}-security" +- type: "deb" +- - name: "mos-holdback" +- section: "main restricted" +- uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/${mos_version}" +- priority: 1100 +- suite: "mos${mos_version}-holdback" +- type: "deb" + PRODUCTION: docker + FEATURE_GROUPS: [] |