aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-07 15:45:41 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-07 15:46:24 +0200
commitd5748bc0dd2fe4241a3924192d6beac860238551 (patch)
tree8b90a938c16d74e0ab15dd5607d3875cf937b39b
parentbaa15e4501d47adb80b1648d059881bdf57b2a9d (diff)
u/fuel: Bump & rebase for keyserver prx refresh
Change-Id: If00a793dccfa6f779a6e2481b41ebec6bbdda39c 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 f331a4b..04792e1 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 b00a1d19..4fdacd83 100644
+index fbc671f3..51c9f437 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -15,3 +15,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 28ccbe4f37cf8b2e38681d4a732f80112888ce8
+Subproject 78d368731c9582361cc291d5618e01702982f2b