u/fuel: Bump & rebase for cmp MCP repos

Bring in MCP repos on baremetal compute nodes.

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

diff --git a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
index f8413cb..ecbe3a5 100644 (file)
--- a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
+++ b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
@@ -37,13 +37,13 @@ index df230452..5bbe0fe4 100644
    - service.keepalived.cluster.single
    - system.glusterfs.server.volume.glance
 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
-index 741f9d35..5c08d6d2 100644
+index 24acbacf..e9f95f2d 100644
 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
-@@ -7,6 +7,7 @@
- ##############################################################################
+@@ -8,6 +8,7 @@
  ---
  classes:
+   - system.linux.system.repo.mcp.openstack
 +  - system.linux.system.repo.mcp.armband
    - system.linux.system.repo.glusterfs
    - system.glusterfs.client.cluster

diff --git a/upstream/fuel b/upstream/fuel
index cfc5988..58aa624 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit cfc5988be48d1317244e71fd7919480db18745d4
+Subproject commit 58aa624bbe7d26ec23986b78f9ba59bafa7666ab