diff options
| author |   Charalampos Kominos <Charalampos.Kominos@enea.com> | 2018-03-29 16:34:08 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-29 22:38:02 +0200 |
| commit | 46040c0ab85aeba942b7ec7897b32243f859aac0 (patch) | |
| tree | b7a92b436e780346d01c0e77d8c93a897bebed0d | |
| parent | 26ab32286d2c3daee92bd27c32a51bbbf5a281f5 (diff) | |
u/fuel: Bump & rebase for ovs config fixes
Change-Id: I7227fea1c10974754c9e6224dcf0dcb4701d24b7
Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
4 files changed, 3 insertions, 3 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 8c11a207..fb98d47c 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,7 +66,7 @@ index 00000000..0368937d + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 711b0f3a..dc1118d6 100644 +index b650ec87..4d19dfe7 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -17,3 +17,4 @@ 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 3092daee..ef8d0f9c 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,7 +150,7 @@ index 00000000..78eb0bff + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index dc1118d6..6541cbba 100644 +index 4d19dfe7..cd7a1d5a 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -18,3 +18,5 @@ 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 4d2da653..092bf241 100644 --- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch @@ -49,7 +49,7 @@ 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 6541cbba..2c89dfc3 100644 +index cd7a1d5a..e7fa2958 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -20,3 +20,4 @@ diff --git a/upstream/fuel b/upstream/fuel -Subproject b3b4b2e1bcd42f4628e53796c3dab81151f56bc +Subproject f3314c74504d8bc324211cd60241674f1998efd |