u/fuel: Bump & rebase for compute parameterization

[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 85ee6b5..a4f0a68 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
@@ -18,7 +18,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
  ...-Add-curtin_userdata_arm64_generic_xenial.patch | 35 +++++++++++++++++++++
  mcp/patches/patches.list                           |  1 +
- .../baremetal-mcp-pike-common-ha/infra/maas.yml    | 36 ++++++++++++++++++++++
+ .../cluster/mcp-pike-common-ha/infra/maas.yml      | 36 ++++++++++++++++++++++
  .../files/curtin_userdata_arm64_generic_xenial     | 35 +++++++++++++++++++++
  4 files changed, 107 insertions(+)
  create mode 100644 mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
@@ -66,19 +66,19 @@ index 0000000..0368937
 +   file.managed:
 +   - source: salt://maas/files/pgpass
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 34d913a..01e3224 100644
+index 22d5a7a..1229fc5 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
 @@ -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: 0012-routes-Skip-network-restart-on-noifupdown.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 3bf87dc..4954559 100644
---- 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
-@@ -40,6 +40,42 @@ parameters:
+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
+--- 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:
          enable_third_party_drivers: true
          network_discovery: 'enabled'
          default_min_hwe_kernel: ${_param:hwe_kernel}