diff options
| author |   Cristina Pauna <cristina.pauna@enea.com> | 2018-04-13 12:26:43 +0200 |
|---|---|---|
| committer | Cristina Pauna <cristina.pauna@enea.com> | 2018-04-13 11:43:02 +0000 |
| commit | a47d40796dd33d61fca1dd5434855f977839e5c1 (patch) | |
| tree | 18df741c0693dfcfe6bcf0578ee3b3dd363ee854 | |
| parent | 0abdc6ec87ddaa396bb3069a67117e3f3bb6258c (diff) | |
u/fuel: Bump & rebase for ODL cleanup
Change-Id: Ie23a49c17ab4890fc1262d1111efd85ec83d7866
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
(cherry picked from commit 0d7a1834aea3bde3e27892919ae731b5cdae5560)
4 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 fb98d47c..0b5a0234 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 @@ -66,10 +66,10 @@ index 00000000..0368937d + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index b650ec87..4d19dfe7 100644 +index dfb0df77..96025157 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -17,3 +17,4 @@ +@@ -16,3 +16,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 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 cd3f8db7..eef084fc 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,10 +150,10 @@ index 00000000..78eb0bff + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 4d19dfe7..cd7a1d5a 100644 +index 96025157..9ce1cc9c 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -18,3 +18,5 @@ +@@ -17,3 +17,5 @@ /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/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch index 092bf241..c9075787 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 00000000..d40e63b2 + 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 cd7a1d5a..e7fa2958 100644 +index 9ce1cc9c..efcf3662 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -20,3 +20,4 @@ +@@ -19,3 +19,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 -Subproject 360e605cda3e6bdeceb06cc0528c1cc0e6e60ed +Subproject ef46d8af46c861bdff5ba835bd89b97b334ea45 |