From 3c5d2bb2256316595245f1dfd0a2eea74e284fc2 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 24 Apr 2018 20:00:38 +0200
Subject: [PATCH] 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>
---
.../0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch | 6 +++---
upstream/fuel | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
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 f8413cbd..ecbe3a5b 100644
--- 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 cfc5988b..58aa624b 160000
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit cfc5988be48d1317244e71fd7919480db18745d4
+Subproject commit 58aa624bbe7d26ec23986b78f9ba59bafa7666ab
--
2.16.6