From 9565a20367bca5df4b4273e7c4057ea4260a9475 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 19 Dec 2017 19:09:15 +0100 Subject: u/fuel: Bump & rebase for MaaS DHCP fix While at it, adjust patch context for recently changed libvirtd socket group in salt-formula-libvirt. Change-Id: Ia2481b2c7efabdb0419999993961ee1f2fdf07fa Signed-off-by: Alexandru Avadanii --- .../0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 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 09f92336..84def033 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,12 +64,12 @@ index 0000000..0368937 + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index a54fadc..3aa6308 100644 +index f2549d7..a2f6a19 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/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch + /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: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml -- cgit 1.2.3-korg