From 057a69974a433b4cac6ed51a92b95ffc4517edf5 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 7 Mar 2018 23:02:40 +0100 Subject: u/fuel: Bump & rebase for net_config ip-range JIRA: FUEL-351 Change-Id: I7b893e9d94eaf9e34daee3bf4442229be964c294 Signed-off-by: Alexandru Avadanii --- .../0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '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 3eed506f..e1aefaa7 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 @@ -26,7 +26,7 @@ Signed-off-by: Alexandru Avadanii 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,16 +66,16 @@ index 0000000..0368937 + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index e0ad1f7..59b617d 100644 +index efe38218..76d782e1 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -16,3 +16,4 @@ +@@ -17,3 +17,4 @@ /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch /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 @@ -- cgit 1.2.3-korg