From 630168005568fff7ec59e66527412b05a51a060b Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 10 Jan 2019 15:47:00 +0100 Subject: [patch] Drop reclass.system patch for repo arch MCP repos no longer publish arm64 metadata, so drop our patch that selected arm64 metadata on arm64 systems. Instead, let it default to 'deb [arch=amd64]', which will allow arm64 systems to fetch amd64 metadata and inherintely fetch all arch-independent packages from the same repos. While at it, switch to 'rocky-armband' repos on arm64 systems. Change-Id: I07fda895f5162bfa576c62336cbb4d74e985f37a Signed-off-by: Alexandru Avadanii --- .../installation/installation.instruction.rst | 8 +-- docs/release/release-notes/release-notes.rst | 4 +- mcp/config/scenario/defaults.yaml.j2 | 4 +- ...system.repo-Drop-arch-for-mcp.mirror-repo.patch | 81 ---------------------- ...003-linux.system.repo-Fix-archive-key-URL.patch | 76 ++++++++++++++++++++ .../cluster/mcp-common-ha/openstack_init.yml.j2 | 2 +- .../cluster/mcp-common-noha/openstack_init.yml.j2 | 2 +- 7 files changed, 86 insertions(+), 91 deletions(-) delete mode 100644 mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch create mode 100644 mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst index c17484f3f..b0efd57ab 100644 --- a/docs/release/installation/installation.instruction.rst +++ b/docs/release/installation/installation.instruction.rst @@ -303,7 +303,7 @@ installed on the Jumpserver: .. code-block:: console jenkins@jumpserver:~$ cat /etc/apt/sources.list.d/armband.list - deb http://linux.enea.com/mcp-repos/queens/xenial queens-armband main + deb http://linux.enea.com/mcp-repos/rocky/xenial rocky-armband main jenkins@jumpserver:~$ sudo apt-key adv --keyserver keys.gnupg.net \ --recv 798AB1D1 @@ -1375,7 +1375,7 @@ For more information on the OPNFV ``Gambia`` 7.2 release, please see: #. `OPNFV Documentation`_ #. `OPNFV Software Downloads`_ #. `OPNFV Gambia Wiki Page`_ -#. `OpenStack Queens Release Artifacts`_ +#. `OpenStack Rocky Release Artifacts`_ #. `OpenStack Documentation`_ #. `OpenDaylight Artifacts`_ #. `Mirantis Cloud Platform Documentation`_ @@ -1390,8 +1390,8 @@ For more information on the OPNFV ``Gambia`` 7.2 release, please see: .. _`Mirantis Cloud Platform Documentation`: https://docs.mirantis.com/mcp/latest/ .. _`fuel git repository`: https://git.opnfv.org/fuel .. _`pharos git repo`: https://git.opnfv.org/pharos -.. _`OpenStack Documentation`: https://docs.openstack.org/queens -.. _`OpenStack Queens Release Artifacts`: https://www.openstack.org/software/queens +.. _`OpenStack Documentation`: https://docs.openstack.org/rocky +.. _`OpenStack Rocky Release Artifacts`: https://www.openstack.org/software/rocky .. _`OPNFV Home Page`: https://www.opnfv.org .. _`OPNFV Gambia Wiki Page`: https://wiki.opnfv.org/display/SWREL/Gambia .. _`OPNFV Documentation`: https://docs.opnfv.org diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index 69e6f81bd..50950c9c9 100644 --- a/docs/release/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst @@ -249,8 +249,8 @@ For more information on the OPNFV ``Gambia`` 7.2 release, please see: .. _`MCP`: https://www.mirantis.com/software/mcp/ .. _`Mirantis Cloud Platform Documentation`: https://docs.mirantis.com/mcp/latest/ .. _`fuel git repository`: https://git.opnfv.org/fuel -.. _`OpenStack Documentation`: https://docs.openstack.org/queens -.. _`OpenStack Queens Release Artifacts`: https://www.openstack.org/software/queens +.. _`OpenStack Documentation`: https://docs.openstack.org/rocky +.. _`OpenStack Rocky Release Artifacts`: https://www.openstack.org/software/rocky .. _`OPNFV Home Page`: https://www.opnfv.org .. _`OPNFV Gambia Wiki Page`: https://wiki.opnfv.org/display/SWREL/Gambia .. _`OPNFV Documentation`: https://docs.opnfv.org diff --git a/mcp/config/scenario/defaults.yaml.j2 b/mcp/config/scenario/defaults.yaml.j2 index 141af4d26..73799c5bb 100644 --- a/mcp/config/scenario/defaults.yaml.j2 +++ b/mcp/config/scenario/defaults.yaml.j2 @@ -54,12 +54,12 @@ aarch64: common: apt: keys: - - https://linux.enea.com/mcp-repos/queens/xenial/archive-mcpqueens.key + - https://linux.enea.com/mcp-repos/rocky/xenial/archive-mcprocky.key - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub repos: # deb [arch=] - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main - - armband_3 1201 deb [arch=arm64] http://linux.enea.com/mcp-repos/queens/xenial queens-armband main + - armband_3 1201 deb [arch=arm64] http://linux.enea.com/mcp-repos/rocky/xenial rocky-armband main pkg: install: - python-futures diff --git a/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch deleted file mode 100644 index 3d2605786..000000000 --- a/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch +++ /dev/null @@ -1,81 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2018 Mirantis Inc., 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 -Date: Thu, 7 Jun 2018 21:19:07 +0200 -Subject: [PATCH] linux.system.repo: Drop arch for mcp.mirror repo - -Extending the arch list to 'amd64,arm64' would lead to doubling repo -metadata downloads on all archs, while dropping it will allow APT to -only download the repo metadata for the current system arch. - -Setting the new linux_system_architectures is also problematic in the -context of mixed-architecture clusters. - -To keep old behavior for amd64 and prevent multiple downloads, let's -just drop the 'architectures' field. - -Signed-off-by: Alexandru Avadanii - -diff --git a/keystone/client/os_client_config/admin_identity.yml b/keystone/client/os_client_config/admin_identity.yml -index d31db498..f6b6e5d6 100644 ---- a/keystone/client/os_client_config/admin_identity.yml -+++ b/keystone/client/os_client_config/admin_identity.yml -@@ -9,7 +9,7 @@ parameters: - clouds: - admin_identity: - region_name: ${_param:openstack_region} -- identity_api_version: '3' -+ identity_api_version: 3 - interface: 'internal' - auth: - username: 'admin' -diff --git a/keystone/client/v3/service/heat.yml b/keystone/client/v3/service/heat.yml -index 6c45bfe2..f1d500c7 100644 ---- a/keystone/client/v3/service/heat.yml -+++ b/keystone/client/v3/service/heat.yml -@@ -6,6 +6,9 @@ parameters: - client: - resources: - v3: -+ domains: -+ heat_user_domain: -+ description: 'Contains users and projects created by heat' - roles: - heat_stack_user: - name: heat_stack_user -@@ -21,6 +24,14 @@ parameters: - service_admin: - name: admin - project_id: service -+ heat_domain_admin: -+ password: ${_param:heat_domain_admin_password} -+ email: ${_param:admin_email} -+ roles: -+ heat_stack_admin: -+ name: admin -+ role_domain_id: heat_user_domain -+ domain_id: heat_user_domain - services: - heat: - type: orchestration -diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml -index a4a369b2..12647495 100644 ---- a/linux/system/repo/mcp/mirror/v1/openstack.yml -+++ b/linux/system/repo/mcp/mirror/v1/openstack.yml -@@ -7,9 +7,8 @@ parameters: - repo: - mirantis_openstack: - source: "deb http://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename} ${_param:linux_system_codename} main" -- architectures: ${_param:linux_system_architecture} - clean_file: true -- key_url: https://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename}/archive-${_param:openstack_version}.key -+ key_url: https://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename}/archive-openstack-${_param:openstack_version}.key - pin: - - pin: 'release o=Mirantis' - priority: 1100 diff --git a/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch new file mode 100644 index 000000000..dbb127406 --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch @@ -0,0 +1,76 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 Mirantis Inc., 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 +Date: Thu, 7 Jun 2018 21:19:07 +0200 +Subject: [PATCH] linux.system.repo: Fix archive key URL + +While at it, fix keystone specifics for Rocky. + +Signed-off-by: Alexandru Avadanii +--- + keystone/client/os_client_config/admin_identity.yml | 2 +- + keystone/client/v3/service/heat.yml | 11 +++++++++++ + linux/system/repo/mcp/mirror/v1/openstack.yml | 2 +- + 3 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/keystone/client/os_client_config/admin_identity.yml b/keystone/client/os_client_config/admin_identity.yml +index d31db498..f6b6e5d6 100644 +--- a/keystone/client/os_client_config/admin_identity.yml ++++ b/keystone/client/os_client_config/admin_identity.yml +@@ -9,7 +9,7 @@ parameters: + clouds: + admin_identity: + region_name: ${_param:openstack_region} +- identity_api_version: '3' ++ identity_api_version: 3 + interface: 'internal' + auth: + username: 'admin' +diff --git a/keystone/client/v3/service/heat.yml b/keystone/client/v3/service/heat.yml +index 6c45bfe2..f1d500c7 100644 +--- a/keystone/client/v3/service/heat.yml ++++ b/keystone/client/v3/service/heat.yml +@@ -6,6 +6,9 @@ parameters: + client: + resources: + v3: ++ domains: ++ heat_user_domain: ++ description: 'Contains users and projects created by heat' + roles: + heat_stack_user: + name: heat_stack_user +@@ -21,6 +24,14 @@ parameters: + service_admin: + name: admin + project_id: service ++ heat_domain_admin: ++ password: ${_param:heat_domain_admin_password} ++ email: ${_param:admin_email} ++ roles: ++ heat_stack_admin: ++ name: admin ++ role_domain_id: heat_user_domain ++ domain_id: heat_user_domain + services: + heat: + type: orchestration +diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml +index a4a369b2..f7048f74 100644 +--- a/linux/system/repo/mcp/mirror/v1/openstack.yml ++++ b/linux/system/repo/mcp/mirror/v1/openstack.yml +@@ -9,7 +9,7 @@ parameters: + source: "deb http://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename} ${_param:linux_system_codename} main" + architectures: ${_param:linux_system_architecture} + clean_file: true +- key_url: https://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename}/archive-${_param:openstack_version}.key ++ key_url: https://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename}/archive-openstack-${_param:openstack_version}.key + pin: + - pin: 'release o=Mirantis' + priority: 1100 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 2434a9117..0e753cd2f 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,7 +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} + armband_repo_version: ${_param:openstack_version} glance_version: ${_param:openstack_version} glance_service_host: ${_param:openstack_control_address} keystone_version: ${_param:openstack_version} 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 8147b8c47..bc0a37678 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,7 +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} + armband_repo_version: ${_param:openstack_version} glance_version: ${_param:openstack_version} glance_service_host: ${_param:cluster_local_address} keystone_version: ${_param:openstack_version} -- cgit 1.2.3-korg