aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-19 15:51:58 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-19 15:51:58 +0200
commitf95ed1cc9e24fc0eeae122d68ae9b4f563d64acb (patch)
tree26a434a0e23231ae853a195ccbec7012918ffaf0
parent223d4a3ccf06e2845a58724186f62a5e79514bd2 (diff)
u/fuel: Bump & rebase for nova placement rectify
Change-Id: I9a4c4a5b30147605d33fa7ea95c28eedcae4ede8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch2
m---------upstream/fuel0
2 files changed, 1 insertions, 1 deletions
diff --git a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
index 7877dfa8..458a84ca 100644
--- a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
@@ -17,7 +17,7 @@ Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
-index 52f5f910..e0c9a628 100644
+index 1870cc46..6378f77d 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -130,7 +130,7 @@ parameters:
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 06c464a9c2aee9cbfa801b2f3842bd0beca6229
+Subproject 3dbd313cc111455f8cf88d0d072ec8a2f3c6f70