diff options
| -rw-r--r-- | docs/release/installation/installation.instruction.rst | 8 | ||||
| -rw-r--r-- | docs/release/release-notes/release-notes.rst | 4 | ||||
| -rw-r--r-- | mcp/config/scenario/defaults.yaml.j2 | 4 | ||||
| -rw-r--r-- | mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch (renamed from mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch) | 25 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 | 2 |
6 files changed, 20 insertions, 25 deletions
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: # <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/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-Fix-archive-key-URL.patch index 3d2605786..dbb127406 100644 --- 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-Fix-archive-key-URL.patch @@ -8,19 +8,16 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Date: Thu, 7 Jun 2018 21:19:07 +0200 -Subject: [PATCH] linux.system.repo: Drop arch for mcp.mirror repo +Subject: [PATCH] linux.system.repo: Fix archive key URL -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. +While at it, fix keystone specifics for Rocky. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + 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 @@ -65,14 +62,12 @@ index 6c45bfe2..f1d500c7 100644 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 +index a4a369b2..f7048f74 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: +@@ -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} + 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 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} |