diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-27 00:47:43 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-27 00:50:00 +0200 |
commit | 26ab32286d2c3daee92bd27c32a51bbbf5a281f5 (patch) | |
tree | dc6abf1a94d0bc1dcd23bf48df98959659f71845 | |
parent | 1551291ea1d795ba6d3355496d1be355de7558ca (diff) |
u/fuel: Bump & rebase for ODL fixes
Change-Id: I0cd2b8a0315c3dd71435138963927e4648d0ef6f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 8799cd7c..8c11a207 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 9c460f8e..ad1e7456 100644 +index 711b0f3a..dc1118d6 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -18,3 +18,4 @@ +@@ -17,3 +17,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 e84c6269..3092daee 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 ad1e7456..5c6bb653 100644 +index dc1118d6..6541cbba 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -19,3 +19,5 @@ +@@ -18,3 +18,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 7c87d604..4d2da653 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 5c6bb653..482a053a 100644 +index 6541cbba..2c89dfc3 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -21,3 +21,4 @@ +@@ -20,3 +20,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 f74f7bac151f69ae0b50f28e68805a5d8580736 +Subproject b3b4b2e1bcd42f4628e53796c3dab81151f56bc |