aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch')
-rw-r--r--patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch b/patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch
deleted file mode 100644
index d2c7ff0..0000000
--- a/patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 11 Jul 2017 19:43:39 +0200
-Subject: [PATCH] salt.sh: Clone armband repo, apply patches from it
-
-FIXME: Revise the patching mechanism, make things more dynamic.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/scripts/salt.sh | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
-index c44168e..87f25a7 100755
---- a/mcp/scripts/salt.sh
-+++ b/mcp/scripts/salt.sh
-@@ -14,7 +14,17 @@ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} bash -s << SALT_INSTALL_END
- apt-get install -y git curl subversion
-
- svn export --force https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts
-- git clone --depth=1 --recurse-submodules https://git.opnfv.org/fuel
-+ git clone --recurse-submodules https://git.opnfv.org/fuel
-+ # NOTE(armband): no depth speedup on http
-+ git clone http://git.opnfv.org/armband
-+
-+ # For patch applying purposes (workaround for empty git config)
-+ export GIT_COMMITTER_NAME="OPNFV Armband"
-+ export GIT_COMMITTER_EMAIL="armband@enea.com"
-+ git -C /root/fuel am -3 --patch-format=mbox \
-+ /root/armband/patches/opnfv-fuel/*.patch
-+ git -C /root/fuel/mcp/reclass/classes/system am -3 --patch-format=mbox \
-+ /root/armband/patches/reclass-system-salt-model/*.patch
- ln -s /root/fuel/mcp/reclass /srv/salt/reclass
-
- mkdir -p /usr/share/salt-formulas/reclass