diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-12-25 11:42:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-12-25 11:42:53 +0000 |
| commit | fb8ee43b0e2b597a8058ae1fbab93ba916fbf70a (patch) | |
| tree | 79379024aa423b3723e905dbc116829f60efdd86 /mcp | |
| parent | f5e6ef718d048be9e8f00a4b37e68e1a9ecfb5bb (diff) | |
| parent | 7e7c4ae4ddd5d2016defcdcdedaabb28e2f931f7 (diff) | |
Merge "[armband] Parameterize aarch64 specific repo comp"
Diffstat (limited to 'mcp')
3 files changed, 8 insertions, 6 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 index 4b11478e4..18d208134 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 @@ -82,8 +82,8 @@ parameters: armband: name: armband enabled: '1' - url: 'http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}' - distributions: '${_param:openstack_version}-armband' + url: 'http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/${_param:linux_system_codename}' + distributions: '${_param:armband_repo_version}-armband' components: 'main' arches: 'arm64' key: ${_param:armband_key} 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 b3c51f2e3..2434a9117 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 @@ -121,6 +121,7 @@ parameters: neutron_compute_agent_mode: legacy neutron_compute_external_access: 'True' galera_server_cluster_name: openstack_cluster + armband_repo_version: 'queens' # ${_param:openstack_version} glance_version: ${_param:openstack_version} glance_service_host: ${_param:openstack_control_address} keystone_version: ${_param:openstack_version} @@ -198,10 +199,10 @@ parameters: {%- if 'aarch64' in nm.cluster.arch %} repo: 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" + source: "deb http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/${_param:linux_system_codename} ${_param:armband_repo_version}-armband main" key: ${_param:armband_key} pin: - - pin: 'release a=${_param:openstack_version}-armband' + - pin: 'release a=${_param:armband_repo_version}-armband' priority: 1201 package: '*' {%- endif %} 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 02b6e9ea5..8147b8c47 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 @@ -32,6 +32,7 @@ parameters: cluster_node02_address: ${_param:opnfv_openstack_control_node02_address} cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:opnfv_openstack_control_node03_address} + armband_repo_version: 'queens' # ${_param:openstack_version} glance_version: ${_param:openstack_version} glance_service_host: ${_param:cluster_local_address} keystone_version: ${_param:openstack_version} @@ -84,10 +85,10 @@ parameters: {%- if 'aarch64' in nm.cluster.arch %} repo: 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" + source: "deb http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/${_param:linux_system_codename} ${_param:armband_repo_version}-armband main" key: ${_param:armband_key} pin: - - pin: 'release a=${_param:openstack_version}-armband' + - pin: 'release a=${_param:armband_repo_version}-armband' priority: 1201 package: '*' {%- endif %} |