u/fuel: Bump & rebase for virtual PDF support

[armband.git] / patches / opnfv-fuel / 0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch

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 85751ce..90e9f7c 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
@@ -1,5 +1,5 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
+: Copyright (c) 2018 Enea AB and others.
 :
 : All rights reserved. This program and the accompanying materials
 : are made available under the terms of the Apache License, Version 2.0
@@ -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/mcp-pike-common-ha/infra/kvm.yml         | 1 +
+ mcp/reclass/classes/cluster/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/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
+index 9f85366..3a6eb84 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
++++ b/mcp/reclass/classes/cluster/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.mcp.armband
    - 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
+   - 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 2e79f80..8fe5c37 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 @@
  ##############################################################################
  ---
  classes:
-+  - system.linux.system.repo.mcp.armband.openstack
-   - system.linux.system.repo.mcp.extra
++  - system.linux.system.repo.mcp.armband
    - system.linux.system.repo.glusterfs
    - system.linux.storage.loopback
+   - system.glusterfs.client.cluster