summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-28 23:53:15 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-29 00:09:23 +0100
commitb8a5f2593d1c9a920e41bedec9ee3467200bedea (patch)
treec0c1e4745d9e4c5df28c53bd486338f3efc8ffed /patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
parent709976cdb4cec03c51cefcb04cef4cc160a7508b (diff)
u/fuel: Bump & rebase for OVS-DPDK vxlan
Fix patch context after [1] was pushed upstream. Update copyright year in Fuel patches (and template). [1] https://github.com/salt-formulas/salt-formula-salt/commit/4c7cd2d Change-Id: I41755993cfc2dac89e8060768f01d58c5d2e5767 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch')
-rw-r--r--patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
index ffcb1369..30280b3c 100644
--- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
@@ -1,5 +1,5 @@
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
+: Copyright (c) 2018 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
@@ -66,13 +66,13 @@ index 0000000..0368937
+ file.managed:
+ - source: salt://maas/files/pgpass
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 1b3bfea..c460abb 100644
+index 34d913a..01e3224 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -17,3 +17,4 @@
- /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
+@@ -18,3 +18,4 @@
/usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
/usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
+ /usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch
+/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
index da28abf..65e6557 100644