aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-29 18:23:28 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-29 18:23:42 +0200
commitf776d862ce62f66e09a3c695b67b1905f9ecfae7 (patch)
treea4e1ac2d755abfd6080a246a8867d51343e62328
parentd95049ef01e3ac6e1405fd4a6436caf1a2966686 (diff)
u/fuel: Bump & rebase for MaaS fabric extensionopnfv-6.2.0
Change-Id: I778c2ddde72b29fdd614cde2db5a1c0fe808dbe6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch4
m---------upstream/fuel0
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 23a4dcf..951765f 100644
--- a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0004-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 bd57ecdb..1d8a8910 100644
+index 3d9cb815..a26c9621 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -13,3 +13,5 @@
+@@ -14,3 +14,5 @@
/usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
/usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
/usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch
diff --git a/upstream/fuel b/upstream/fuel
-Subproject c0161169de2a8e149818c277d19f00fe95d3b1f
+Subproject 93c3c3acd269016b63e72cfdda16c8652e0b2f0