summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-07 18:03:26 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-13 05:08:15 +0100
commit466a4c3252e17370ed4d9d7c854738b26dbf1df1 (patch)
tree1651ed356e75d9b93575c1ef785d0edd2fb7a6e4 /patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
parentc952e48d895d963b9381b22fca5914849ba4cfac (diff)
u/fuel: Bump & rebase for Pike upgrade
- virtual deploys will use only UCA repos, without Armband/MCP; - base image pre-build is now upstream, drop our patches; - drop p/fuel libvirtd group workaround, now upstream in Fuel@OPNFV; - drop p/reclass glusterfs PPA arch extension, obsolete; - refactor armband repos in system.repo.mcp into: * armband (new, contains kernel, libvirt etc.); * armband_openstack (move into system.repo.mcp.openstack); * armband_mk_openstack (move intro system.repo.mcp.openstack); * armband_mcp_extra (move into system.repo.mcp.extra); - drop 'nova: Update console defaults for armv7, aarch64'; - minor rebase of nova libvirt driver patches in our roll-up; JIRA: ARMBAND-335 Change-Id: Ic5b7736cdd1d1ad5ff25728925198e8ea3e6b5b1 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch')
-rw-r--r--patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch45
1 files changed, 23 insertions, 22 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 85751ce2..58028197 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
@@ -10,40 +10,41 @@ From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 26 Nov 2017 17:25:08 +0100
Subject: [PATCH] baremetal: Add Armband Openstack repos to kvm, cmp
-Armband provides 2 sets of APT repositories:
-- linux.system.repo.mcp.armband.openstack;
-- linux.system.repo.mcp.armband.extra (currently empty);
+Armband provides one APT repository that should be added to all
+baremetal nodes explicitly (the other Armband repos are now part of
+`linux.system.repo.mcp.openstack` or `linux.system.repo.mcp.extra`):
+- linux.system.repo.mcp.armband;
-These repos are pre-installed for all infrastructure VMs, so we only
-handle them via Salt for baremetal kvm* and cmp* nodes.
+This repo is pre-installed for all infrastructure VMs, so we only
+handle it via Salt for baremetal kvm* and cmp* nodes.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml | 1 +
- .../classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml | 1 +
+ mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml | 1 +
+ .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml | 1 +
2 files changed, 2 insertions(+)
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
-index ce7fc85..6491798 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
+index fe96465..37805ca 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
@@ -7,6 +7,7 @@
##############################################################################
---
classes:
-+ - system.linux.system.repo.mcp.armband.openstack
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.linux.system.repo.glusterfs
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
-index e07e611..278e55b 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
++ - system.linux.system.repo.mcp.armband
+ - service.keepalived.cluster.single
+ - system.glusterfs.server.volume.glance
+ - system.glusterfs.server.volume.keystone
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
+index 6324044..ac56a12 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
@@ -7,6 +7,7 @@
##############################################################################
---
classes:
-+ - system.linux.system.repo.mcp.armband.openstack
- - system.linux.system.repo.mcp.extra
- - system.linux.system.repo.glusterfs
++ - system.linux.system.repo.mcp.armband
- system.linux.storage.loopback
+ - system.glusterfs.client.cluster
+ - system.nova.compute.cluster