aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-02 14:45:57 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-02 14:56:35 +0200
commitd6d2348ee690768101ff661c7811c25d9c65c104 (patch)
tree146033b6113215801ab61acbfaa35c42bda2f4bb /mcp
parent5d54a99cb71172e5ccb1bff94bdd98c3212bd769 (diff)
[AArch64] Pin armband repo with highest prio
Mirantis repositories shadow certain packages from Armband repos (e.g. qemu-efi) if pinning is not set. Since MaaS does not allow configuring repo priorities via its API, use Salt pillar data to re-define the Armband repo and set its prio. Change-Id: Ic743f4b684b3f13552792f5f04097fac73171b37 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/config/scenario/defaults.yaml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j28
2 files changed, 9 insertions, 1 deletions
diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml
index dff018f72..05e86965e 100644
--- a/mcp/config/scenario/defaults.yaml
+++ b/mcp/config/scenario/defaults.yaml
@@ -40,7 +40,7 @@ aarch64:
repos:
# <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp>
- saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main
- - armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/queens/xenial queens-armband main
+ - armband 1201 deb [arch=arm64] http://linux.enea.com/mcp-repos/queens/xenial queens-armband main
pkg:
install:
- linux-generic-hwe-16.04
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
index d070cf3ed..b0f28f9f1 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
@@ -252,6 +252,14 @@ parameters:
- pin: 'release o=Canonical'
priority: 1200
package: 'python-pymysql libvirt* *qemu*'
+{%- if 'aarch64' in nm.cluster.arch %}
+ armband_3: # Should be in sync with the repo config generated via curtin/MaaS
+ source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-armband main"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-armband'
+ priority: 1201
+ package: '*'
+{%- endif %}
kernel:
sysctl:
net.ipv4.tcp_congestion_control: yeah