aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-09 16:22:17 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-09 16:27:29 +0200
commit57394af07a32a56ecff1b2c6f0a7253585ae6fb9 (patch)
tree2e2396be06d70fd3486623373517ab6d585b5549
parent3382a34f0a47433e39b332953d0bac0c91d579c9 (diff)
u/fuel: Bump & rebase for MaaS formula rework
Change-Id: Ica95d00123b99afc916c4fb58a45bf3f068ea7a6
-rw-r--r--patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch4
m---------upstream/fuel0
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 9606e8a6..11abe1dd 100644
--- a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0003-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 17573d95..5c6a7562 100644
+index a17fd694..6dd688ee 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -12,3 +12,5 @@
+@@ -11,3 +11,5 @@
/usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
/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
diff --git a/upstream/fuel b/upstream/fuel
-Subproject b52c4df4061fd7a51aad94f144bb1326fa8a8b5
+Subproject 3831d538436cbf7c033b560b76f554a1dfe28a4