summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-12-31 12:24:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-12-31 12:24:33 +0000
commit15d12dc0eb1bccf37a6b96c5c2188d94f199c62b (patch)
treef7fca5bdd236f8b4d2f490b2814f05b1ff950ef9 /mcp/reclass/classes
parent34d8df8686883ca62876ce85a0ad1fc8e6513f6e (diff)
parent172fa65b1b2b9cea3f15fcd65e00dafe7fe3f1b2 (diff)
Merge "aarch64: Pin qemu-efi from Armband repos" into stable/iruya
Diffstat (limited to 'mcp/reclass/classes')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j211
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j211
2 files changed, 18 insertions, 4 deletions
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 bdc23ff6a..a55485ea0 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
@@ -203,10 +203,17 @@ parameters:
armband_3: # Should be in sync with the repo config generated via curtin/MaaS
source: "deb http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/xenial ${_param:armband_repo_version}-armband main"
key: ${_param:armband_key}
- pin:
- - pin: 'release a=${_param:armband_repo_version}-armband'
+ pinning:
+ 15:
+ enabled: true
+ pin: 'release a=${_param:armband_repo_version}-armband'
priority: 15
package: '*'
+ 1200:
+ enabled: true
+ pin: 'release a=${_param:armband_repo_version}-armband'
+ priority: 1200
+ package: 'qemu-efi'
{%- endif %}
kernel:
sysctl:
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
index 8fe37f9ef..61f222cb1 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
@@ -86,10 +86,17 @@ parameters:
armband_3: # Should be in sync with the repo config generated via curtin/MaaS
source: "deb http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/xenial ${_param:armband_repo_version}-armband main"
key: ${_param:armband_key}
- pin:
- - pin: 'release a=${_param:armband_repo_version}-armband'
+ pinning:
+ 15:
+ enabled: true
+ pin: 'release a=${_param:armband_repo_version}-armband'
priority: 15
package: '*'
+ 1200:
+ enabled: true
+ pin: 'release a=${_param:armband_repo_version}-armband'
+ priority: 1200
+ package: 'qemu-efi'
{%- endif %}
network:
host: