From cf421ba6f593ad1d7c926db618657f8bf66d01a7 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 10 May 2018 18:09:26 +0200 Subject: [salt] Retire Armband Saltstack repos Provided we take care of the minor consequences of relying strictly on upstream Saltstack amd64 repos on arm64 (since we don't use RAET, this means merely installing `python-futures` as a dependency of `python-tornado` on all minions), we can finally drop our Salstack arm64 repository. This implies installing python-futures on: - FN and VCP VMs (handled via lib.sh pre-patching); - baremetal nodes (handled via MaaS Curtin template for arm64 now); While at it, also handle other minor patch cleanup operations: * drop `system.linux.system.repo.mcp.armband`, already covered by: - lib.sh pre-patching for FN and VCP VM images; - maas.region.repositories for baremetal nodes; * switch glusterfs PPA repo arch from 'amd64,arm64' to None; * drop obsolete patch handling `mcelog` on AArch64; [1] https://github.com/salt-formulas/salt-formula-maas/pull/26 JIRA: ARMBAND-382 Change-Id: I34f3bd70ebf10395e8d4e70498ff3a144b4d9c3b Signed-off-by: Alexandru Avadanii (cherry picked from commit d680c5fb86c3fd4b25e7b7f766064a6ef4bf9a3b) --- ...PDF-Use-arm-virtual2-POD-config-in-sample.patch | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch (limited to 'patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch') diff --git a/patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch b/patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch new file mode 100644 index 00000000..c3ffa52a --- /dev/null +++ b/patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch @@ -0,0 +1,67 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: Tue, 18 Jul 2017 19:17:24 +0200 +Subject: [PATCH] vPDF: Use arm-virtual2 POD config in sample + +NOTE: This will be obsoleted when arm-virtual2 vPDF+IDF lands upstream +in Pharos git repo. + +Until then, just align the public network configuration used by the +virtual POD with the Enea lab configuration specific to arm-virtual2 +(i.e. public network on 10.0.9.0/24). + +Signed-off-by: Alexandru Avadanii +--- + mcp/config/labs/local/idf-virtual1.yaml | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml +index 79a5fa04..8a5fbb91 100644 +--- a/mcp/config/labs/local/idf-virtual1.yaml ++++ b/mcp/config/labs/local/idf-virtual1.yaml +@@ -42,10 +42,10 @@ idf: + public: + interface: 3 # when used, will be fourth vnet interface, untagged + vlan: native +- network: 10.16.0.0 +- ip-range: 10.16.0.100-10.16.0.254 # Some IPs are in use by lab infra ++ network: 10.0.9.0 ++ ip-range: 10.0.9.100-10.0.9.253 # Some IPs are in use by lab infra + mask: 24 +- gateway: 10.16.0.1 ++ gateway: 10.0.9.254 + dns: + - 8.8.8.8 + - 8.8.4.4 +@@ -61,16 +61,16 @@ idf: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list, index should be in sync with interface index in PDF +- - 'ens3' +- - 'ens4' +- - 'ens5' +- - 'ens6' ++ - 'enp1s0' ++ - 'enp2s0' ++ - 'enp3s0' ++ - 'enp4s0' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` +- - '0000:00:03.0' +- - '0000:00:04.0' +- - '0000:00:05.0' +- - '0000:00:06.0' ++ - '0000:01:00.0' ++ - '0000:02:00.0' ++ - '0000:03:00.0' ++ - '0000:04:00.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces -- cgit 1.2.3-korg