From 01e02374e99162c86e8f18aaaba5f8071aad21dd Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 27 Dec 2017 17:12:58 +0100 Subject: u/fuel: Bump & rebase for MaaS patch squash Change-Id: Ibbdb467b4656493c6effa68991dab1902e78b7fe Signed-off-by: Alexandru Avadanii --- .../0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 6 +++--- .../opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch | 6 +++--- patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch | 4 ++-- upstream/fuel | 2 +- 4 files changed, 9 insertions(+), 9 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 3e45d22a..6431c942 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 56c3f1c..ab9676d 100644 +index cd32378..fc2ddea 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -15,3 +15,4 @@ +@@ -14,3 +14,4 @@ + /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.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-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch index 902ccefc..ec0a4fa5 100644 --- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -150,11 +150,11 @@ index 0000000..a9fe11b + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index ab9676d..5b06356 100644 +index fc2ddea..fdd3872 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -16,3 +16,5 @@ - /usr/share/salt-formulas/env: 0011-maas-region-interface-default-mode-DHCP.patch +@@ -15,3 +15,5 @@ + /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.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 +/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch diff --git a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch index 7bf2de95..808ca49c 100644 --- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch @@ -49,10 +49,10 @@ index 0000000..d40e63b + cmd += 'else sh {0} -c /tmp {1}; fi'.format( + os.path.join(tmppath, 'bootstrap-salt.sh'), arg) diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 5b06356..16c9ac3 100644 +index fdd3872..daf3368 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -18,3 +18,4 @@ +@@ -17,3 +17,4 @@ /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch /usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch /usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch diff --git a/upstream/fuel b/upstream/fuel index 6eb44a15..0892eb16 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 6eb44a1523d8ec4083c58a89436df639c6e547cf +Subproject commit 0892eb16c1785703adfb14a5fdea3eb7201d15b7 -- cgit 1.2.3-korg