u/fuel: Bump & rebase for MCP repos on HA

Switch from UCA pike-staging repository to Mirantis MCP repo.

Change-Id: I7f4935521a0ff649ca0919d0d1be37ca17263051
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch
index ade946d..452bd1a 100644 (file)
--- a/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch
@@ -17,10 +17,10 @@ Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
-index 6f7b33e3..dfc212e2 100644
+index 599c48e8..018253bb 100644
 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
-@@ -139,7 +139,7 @@ parameters:
+@@ -130,7 +130,7 @@ parameters:
      server:
        cacert: /etc/ssl/certs/mcp_os_cacert
        openrc_extra:

diff --git a/upstream/fuel b/upstream/fuel
index fde6463..a021366 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit fde64636e043bd54057987f3850c784723cd32fc
+Subproject commit a021366c0934d74889ac7d64e0857e35bdd0319c