aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-24 20:00:38 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-24 18:04:07 +0000
commite7796e2e5837c3dc25d04a70dfa1d75a7ca69c65 (patch)
treed69cf19cceb8a012d631c5b2a8d0432f2a68b5d5
parent3f7602eaa9811170b9caeda6f927cdf6e264738c (diff)
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> (cherry picked from commit 3c5d2bb2256316595245f1dfd0a2eea74e284fc2)
-rw-r--r--patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch6
m---------upstream/fuel0
2 files changed, 3 insertions, 3 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 f8413cb..ecbe3a5 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
-Subproject cfc5988be48d1317244e71fd7919480db18745d
+Subproject 58aa624bbe7d26ec23986b78f9ba59bafa7666a