aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-22 20:50:39 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-22 18:49:45 +0000
commitf49c526c5ae897452c15619a3c322d297ff78d36 (patch)
tree8ab95787be762f14be82e1f31101753d04c57daf
parentcf421ba6f593ad1d7c926db618657f8bf66d01a7 (diff)
u/fuel: Bump & rebase for generate_dhparams fix
Change-Id: Idd82da13949905a09158010cfd3f58912cccefe5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit f7b415771ffd76ee1100b6b056942ba8db754b1d)
-rw-r--r--patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch4
m---------upstream/fuel0
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 09dda594..9e62f7e1 100644
--- a/patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0006-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 ce59395c..39e737d6 100644
+index 3cdc646a..a0b625bc 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -16,3 +16,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: 0016-Set-boot-source-selections.patch
diff --git a/upstream/fuel b/upstream/fuel
-Subproject bd04374d931bea88476d4c3d08ac44f46febecc
+Subproject c7dff6e1ae6444f60d3fe20b1f495609c798005