diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-07-29 22:49:26 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-01 00:16:27 +0200 |
commit | 8d7128a62cd2f9b3df1d59bf4aa4fa7a387b1679 (patch) | |
tree | 9d6dba2a15d15b7f82668d23373a3ddd28ce9aa9 /build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch | |
parent | 9dfd08262dd3cf833c84cd1c7c1b05c25e09862b (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-main/0001-Patches-for-OPNFV.patch')
-rw-r--r-- | build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch deleted file mode 100644 index bf0f331db..000000000 --- a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch +++ /dev/null @@ -1,64 +0,0 @@ -From: "Stefan K. Berg" <sfb@consultron.com> -Date: Fri, 4 Nov 2016 16:06:42 +0100 -Subject: [PATCH] Patches for OPNFV - ---- - iso/bootstrap_admin_node.sh | 30 +++++++++++++++++++++++++++--- - 1 file changed, 27 insertions(+), 3 deletions(-) - -diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh -index dbcac5f..472e418 100755 ---- a/iso/bootstrap_admin_node.sh -+++ b/iso/bootstrap_admin_node.sh -@@ -347,8 +347,23 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail - set +x - echo "Done!" - -+### OPNFV addition BEGIN -+shopt -s nullglob -+for script in /opt/opnfv/bootstrap/pre.d/*.sh -+do -+ echo "Pre script: $script" >> /root/pre.log 2>&1 -+ $script >> /root/pre.log 2>&1 -+done -+shopt -u nullglob -+ -+# Enable sshd -+systemctl enable sshd -+systemctl start sshd -+ -+### OPNFV addition END -+ - if [[ "$showmenu" == "yes" || "$showmenu" == "YES" ]]; then -- fuelmenu || fail -+ fuelmenu - else - # Give user 15 seconds to enter fuelmenu or else continue - echo -@@ -386,8 +401,7 @@ if [ ! -f /etc/fuel_build_id ]; then - fi - - # Enable sshd --systemctl enable sshd --systemctl start sshd -+systemctl restart sshd - - # Enable iptables - systemctl enable iptables.service -@@ -546,6 +560,16 @@ systemctl start ntpd - - bash /etc/rc.local - -+### OPNFV addition BEGIN -+shopt -s nullglob -+for script in /opt/opnfv/bootstrap/post.d/*.sh -+do -+ echo "Post script: $script" >> /root/post.log 2>&1 -+ $script >> /root/post.log 2>&1 -+done -+shopt -u nullglob -+### OPNFV addition END -+ - if [ "`get_bootstrap_skip`" = "False" ]; then - build_ubuntu_bootstrap bs_status || true - else |