aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-09 17:23:02 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-09 17:23:14 +0200
commitee39de3476ab8b1624b59fff89f89a13dac06d17 (patch)
tree32e6c526a348f1deddf60d88d72cc2c2d36134f7
parent1262ea206b51abdfd3101123173a64fca8e89bfa (diff)
u/fuel: Bump & rebase for MaaS rework
Change-Id: Ie8ff084f5d10d6dc14a35a7c84f50b8ee4949873
-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 951765f6..23a4dcfe 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 3d9cb815..a26c9621 100644
+index bd57ecdb..1d8a8910 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -14,3 +14,5 @@
+@@ -13,3 +13,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 56cfed1a8981a16f2671754d8aa29f7c850a0ee
+Subproject af0c77ae3e7fe3b355ee0e0b08fe931d9b9af8a