blob: ac0dad1acf5154f87dde66ed0f8c2d11920c10b5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: 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
: which accompanies this distribution, and is available at
: http://www.apache.org/licenses/LICENSE-2.0
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
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 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;
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/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/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
index df230452..5bbe0fe4 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
- system.linux.system.repo.glusterfs
- 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 bae1c1c6..a6c3d9ed 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
- system.linux.system.repo.glusterfs
- system.glusterfs.client.cluster
- system.nova.compute.cluster
|
