u/fuel: Bump & rebase for ovs config fixes

[armband.git] / patches / opnfv-fuel / 0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch

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 2329cb5..fb98d47 100644 (file)
--- 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
@@ -26,7 +26,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 
 diff --git a/mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
 new file mode 100644
-index 0000000..0368937
+index 00000000..0368937d
 --- /dev/null
 +++ b/mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
 @@ -0,0 +1,35 @@
@@ -66,7 +66,7 @@ index 0000000..0368937
 +   file.managed:
 +   - source: salt://maas/files/pgpass
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 2dd6385..71249d1 100644
+index b650ec87..4d19dfe7 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
 @@ -17,3 +17,4 @@
@@ -75,7 +75,7 @@ index 2dd6385..71249d1 100644
  /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
 +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
-index e83de35..226a4f6 100644
+index e83de35c..226a4f66 100644
 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
 @@ -41,6 +41,42 @@ parameters:
@@ -123,7 +123,7 @@ index e83de35..226a4f6 100644
            name: ${_param:opnfv_infra_maas_pxe_network_address}/24
 diff --git a/mcp/salt-formulas/maas/files/curtin_userdata_arm64_generic_xenial b/mcp/salt-formulas/maas/files/curtin_userdata_arm64_generic_xenial
 new file mode 100644
-index 0000000..15d10a4
+index 00000000..15d10a48
 --- /dev/null
 +++ b/mcp/salt-formulas/maas/files/curtin_userdata_arm64_generic_xenial
 @@ -0,0 +1,35 @@