From 0ebdf0f1da78a4348609a8a87cfc12d2e16ed585 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 6 Jun 2018 11:37:59 +0200 Subject: u/fuel: Bump & rebase for OpenStack Queens Whie at it, drop architecture field for new MCP mirror repo. Change-Id: Id7c8cad6cba11bd6982861430aecf40ab881e62b Signed-off-by: Alexandru Avadanii --- ...-virtng.py-virt.sls-Extend-libvirt_domain.patch | 20 +++++------ ...006-Set-volume-name-in-source-file-to-sdX.patch | 22 ++++++------ ...system.repo-Drop-arch-for-mcp.mirror-repo.patch | 39 ++++++++++++++++++++++ upstream/fuel | 2 +- 4 files changed, 61 insertions(+), 22 deletions(-) create mode 100644 patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch diff --git a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch index 04792e16..ef3a6f8d 100644 --- a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -26,8 +26,8 @@ Signed-off-by: Alexandru Avadanii ...-virtng-module-Extend-libvirt_domain.patch | 54 +++++++++++++++++++ ...t-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++ mcp/patches/patches.list | 2 + - .../cluster/mcp-pike-common-ha/infra/kvm.yml | 15 ++++++ - .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 | 3 ++ + .../cluster/mcp-common-ha/infra/kvm.yml | 15 ++++++ + .../cluster/mcp-odl-ha/infra/kvm.yml.j2 | 3 ++ 5 files changed, 125 insertions(+) create mode 100644 mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch create mode 100644 mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch @@ -159,10 +159,10 @@ index fbc671f3..51c9f437 100644 /usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch +/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch +/usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch -diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml -index df230452..3548155f 100644 ---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml -+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml +diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml +index 868f324f..73875b87 100644 +--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml ++++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml @@ -52,21 +52,33 @@ parameters: openstack.control: cpu: 4 @@ -207,10 +207,10 @@ index df230452..3548155f 100644 disk_profile: small net_profile: default_ext cluster: -diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 -index 5fc4776d..b19789e3 100644 ---- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 -+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 +diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2 +index ab0da39b..f64ed46a 100644 +--- a/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2 ++++ b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2 @@ -19,6 +19,9 @@ parameters: opendaylight.server: cpu: 4 diff --git a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch index 65d58a78..0876b6f1 100644 --- a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch +++ b/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch @@ -12,14 +12,14 @@ Subject: [PATCH] Set volume name in source file to sdX Signed-off-by: Charalampos Kominos --- - .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +- - .../classes/cluster/mcp-pike-common-noha/openstack_control.yml | 2 +- + .../classes/cluster/mcp-common-ha/openstack_control.yml.j2 | 2 +- + .../classes/cluster/mcp-common-noha/openstack_control.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 -index 599c48e8..018253bb 100644 ---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 -+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 +diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 +index ebec944d..d4906c4e 100644 +--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 ++++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 @@ -130,7 +130,7 @@ parameters: server: cacert: /etc/ssl/certs/mcp_os_cacert @@ -29,11 +29,11 @@ index 599c48e8..018253bb 100644 bind: server: control: -diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml -index 29b2d627..3a994b8d 100644 ---- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml -+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml -@@ -71,7 +71,7 @@ parameters: +diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml +index c4915c79..97dd268f 100644 +--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml ++++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml +@@ -72,7 +72,7 @@ parameters: server: admin_email: ${_param:admin_email} openrc_extra: diff --git a/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch b/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch new file mode 100644 index 00000000..d6dff71f --- /dev/null +++ b/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch @@ -0,0 +1,39 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 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 +--- + linux/system/repo/mcp/mirror/v1/openstack.yml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml +index a4a369b2..933bf53a 100644 +--- a/linux/system/repo/mcp/mirror/v1/openstack.yml ++++ b/linux/system/repo/mcp/mirror/v1/openstack.yml +@@ -7,7 +7,6 @@ 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 + pin: diff --git a/upstream/fuel b/upstream/fuel index 78d36873..bf341b7e 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 78d368731c9582361cc291d5618e01702982f2b9 +Subproject commit bf341b7e0d7e423044827f379e4b180e9dc897a1 -- cgit 1.2.3-korg