aboutsummaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-04 15:46:04 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-04 15:48:43 +0200
commitbaa15e4501d47adb80b1648d059881bdf57b2a9d (patch)
treea0df7f8f56b96545c4302f070c10c46f2d161155 /patches
parent4270458ba464057578f2bbc7360fb8d0f8fa89cc (diff)
u/fuel: Bump & rebase for upstream patches
Change-Id: Ie25c098273b929e9a31adfcfd3eb95dcf856611a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch6
-rw-r--r--patches/opnfv-fuel/0007-curtin-arm64-Fix-missing-newline.patch56
2 files changed, 3 insertions, 59 deletions
diff --git a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 09dda59..f331a4b 100644
--- a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -150,11 +150,11 @@ index 00000000..78eb0bff
+
+ #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index ce59395c..39e737d6 100644
+index b00a1d19..4fdacd83 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -16,3 +16,5 @@
- /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
+@@ -15,3 +15,5 @@
+ /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
/usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
/usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch
+/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
diff --git a/patches/opnfv-fuel/0007-curtin-arm64-Fix-missing-newline.patch b/patches/opnfv-fuel/0007-curtin-arm64-Fix-missing-newline.patch
deleted file mode 100644
index 7d830cc..0000000
--- a/patches/opnfv-fuel/0007-curtin-arm64-Fix-missing-newline.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Wed, 23 May 2018 18:53:04 +0200
-Subject: [PATCH] curtin: arm64: Fix missing newline
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- ...4-Fix-missing-newline-after-j2-parse.patch | 30 +++++++++++++++++++
- mcp/patches/patches.list | 1 +
- 2 files changed, 31 insertions(+)
- create mode 100644 mcp/patches/0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch
-
-diff --git a/mcp/patches/0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch b/mcp/patches/0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch
-new file mode 100644
-index 00000000..f16ed9e7
---- /dev/null
-+++ b/mcp/patches/0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch
-@@ -0,0 +1,30 @@
-+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-+: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-+:
-+: All rights reserved. This program and the accompanying materials
-+: are made available under the terms of the Apache License, Version 2.0
-+: which accompanies this distribution, and is available at
-+: http://www.apache.org/licenses/LICENSE-2.0
-+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-+Date: Wed, 23 May 2018 05:28:00 +0200
-+Subject: [PATCH] curtin: arm64: Fix missing newline after j2 parse
-+
-+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-+---
-+ maas/files/curtin_userdata_arm64_generic_xenial | 2 +-
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+
-+diff --git a/maas/files/curtin_userdata_arm64_generic_xenial b/maas/files/curtin_userdata_arm64_generic_xenial
-+index b070aaa..21877b2 100644
-+--- a/maas/files/curtin_userdata_arm64_generic_xenial
-++++ b/maas/files/curtin_userdata_arm64_generic_xenial
-+@@ -22,7 +22,7 @@ late_commands:
-+ {% set salt_repo_key = salt['hashutil.base64_b64encode'](cluster.saltstack_repo_key) %}
-+ apt_00_set_gpg: ["curtin", "in-target", "--", "sh", "-c", "echo '{{salt_repo_key}}' | base64 -d | apt-key add -"]
-+ {%- endif %}
-+-{#- NOTE: Re-use amd64 repos on arm64 since most packages are arch independent -#}
-++{#- NOTE: Re-use amd64 repos on arm64 since most packages are arch independent #}
-+ apt_01_set_repo: ["curtin", "in-target", "--", "sh", "-c", "echo 'deb [arch=amd64] {{ cluster.saltstack_repo_xenial }}' >> /etc/apt/sources.list"]
-+ {% raw %}
-+ apt_03_update: ["curtin", "in-target", "--", "apt-get", "update"]
-diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 39e737d6..b3aa013e 100644
---- a/mcp/patches/patches.list
-+++ b/mcp/patches/patches.list
-@@ -18,3 +18,4 @@
- /usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch
- /usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
- /usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
-+/usr/share/salt-formulas/env: 0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch