aboutsummaryrefslogtreecommitdiffstats
path: root/build/f_repos/patch/fuel-menu/0001-settings-OPNFV-bootstrap-Default-to-local-mirror.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-07-29 22:49:26 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-01 00:16:27 +0200
commit8d7128a62cd2f9b3df1d59bf4aa4fa7a387b1679 (patch)
tree9d6dba2a15d15b7f82668d23373a3ddd28ce9aa9 /build/f_repos/patch/fuel-menu/0001-settings-OPNFV-bootstrap-Default-to-local-mirror.patch
parent9dfd08262dd3cf833c84cd1c7c1b05c25e09862b (diff)
salt.sh: Drop upstream clone in favor of local git
salt.sh currently clones the full Fuel@OPNFV git repo from upstream public mirror, preventing us from testing locally edited or new patches. Instead, bring back git submodule handling from old f_repos, clone and patch each submodule locally, then copy the whole parent repo over to cfg01. This is also a first step towards implementing offline deploy support. NOTE: This adds new deploy prerequisite packages: - git (for submodule clone/update); - make (for submodule patching); - rsync (for parent repo replication to cfg01); NOTE: Parent repository is expected to be a git repo, in order to work with git submodules. While at it, perform some minor related changes: - add deploy artifacts (ISOs, qcow2 files) to .gitignore, also used to filter-out such files during rsync to cfg01; - remove obsolete Fuel patches (old f_repos mechanism); - rename "reclass-system-salt-model" submodule; Change-Id: I6210d80d41010b2802e4f1b31acf249a18db7963 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'build/f_repos/patch/fuel-menu/0001-settings-OPNFV-bootstrap-Default-to-local-mirror.patch')
-rw-r--r--build/f_repos/patch/fuel-menu/0001-settings-OPNFV-bootstrap-Default-to-local-mirror.patch66
1 files changed, 0 insertions, 66 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
deleted file mode 100644
index 456eea7b9..000000000
--- a/build/f_repos/patch/fuel-menu/0001-settings-OPNFV-bootstrap-Default-to-local-mirror.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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: []