aboutsummaryrefslogtreecommitdiffstats
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>2017-12-18 22:54:55 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-18 22:56:12 +0100
commit569c2cc53dc3a65140978c2bfa89db1500aba1a0 (patch)
tree4a61928c38f2b0847d5696c0cdedc9b335090064 /patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
parente02b8d4f72f2a84c857b1e8bda380f586e679ad0 (diff)
u/fuel: Bump & rebase for MaaS DHCP fix
Change-Id: Icb3516e6520ea6c1996ffffa744b6cfeb1135f41 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.patch12
1 files changed, 6 insertions, 6 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 aac8b0d9..c275b04f 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
@@ -64,22 +64,22 @@ index 0000000..0368937
+ file.managed:
+ - source: salt://maas/files/pgpass
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index a87a935..fe3ff14 100644
+index d16e3c2..0e1b7f6 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -15,3 +15,4 @@
- /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
+@@ -16,3 +16,4 @@
+ /usr/share/salt-formulas/env: 0011-maas-region-interface-default-mode-DHCP.patch
/usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
/usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.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 56cd96b..141f363 100644
+index 6332776..7292ebb 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
-@@ -107,6 +107,32 @@ parameters:
+@@ -108,6 +108,32 @@ parameters:
architecture: ${_param:opnfv_maas_node05_architecture}
distro_series: xenial
- hwe_kernel: hwe-16.04
+ hwe_kernel: ${_param:hwe_kernel}
+ cluster:
+ enabled: true
+ region: