From 6e219065020ced168c5c842e417e1c7875ddbcb0 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 13 Jan 2018 20:54:24 +0100 Subject: [PDD] ericsson-pod*: Move net_config to IDF Change-Id: Ide79f18bae20e599eeefe13f4ad2dba1f4a0207d Signed-off-by: Alexandru Avadanii --- labs/ericsson/idf-pod1.yaml | 36 +++++++++++++++++++++++++++++++++++- labs/ericsson/pod1.yaml | 40 +--------------------------------------- 2 files changed, 36 insertions(+), 40 deletions(-) (limited to 'labs') diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml index 9b4a98d4..d9042544 100644 --- a/labs/ericsson/idf-pod1.yaml +++ b/labs/ericsson/idf-pod1.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others. +# Copyright (c) 2018 Ericsson AB, 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 @@ -10,6 +10,40 @@ idf: version: 0.1 + net_config: + oob: + interface: 0 + ip-range: 172.16.1.16-172.16.1.21 + vlan: native + admin: + interface: 4 + vlan: native + network: 192.168.11.0 # Untagged, 'PXE/Admin' for MaaS (no IP on JP) + mask: 24 + mgmt: + interface: 2 + vlan: 81 + network: 192.168.10.0 + mask: 24 + storage: + interface: 2 + vlan: 82 + network: 192.168.20.0 + mask: 24 + private: + interface: 3 + vlan: 1000 + network: 192.168.2.0 + mask: 24 + public: + interface: 2 + vlan: 80 + network: 100.64.200.0 + mask: 24 + gateway: 100.64.200.1 + dns: + - 8.8.8.8 + - 8.8.4.4 fuel: jumphost: bridges: diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml index 76ca002f..70d47ced 100644 --- a/labs/ericsson/pod1.yaml +++ b/labs/ericsson/pod1.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others. +# Copyright (c) 2018 Ericsson AB, 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 @@ -16,44 +16,6 @@ details: type: production link: https://wiki.opnfv.org/display/pharos/CI-ERICSSON-POD1 ############################################################################## -net_config: - # NOTE: Network names are likely to change after the PDF spec is updated - # NOTE: Some networks (e.g. admin) are created by the installer - # NOTE: Network-to-interface mapping will be reworked after PDF update - oob: - interface: 0 - ip-range: 172.16.1.16-172.16.1.21 - vlan: native - admin: - interface: 4 - vlan: native - network: 192.168.11.0 # Untagged, 'PXE/Admin' for MaaS (no IP on JP) - mask: 24 - mgmt: - interface: 2 - vlan: 81 - network: 192.168.10.0 - mask: 24 - storage: - interface: 2 - vlan: 82 - network: 192.168.20.0 - mask: 24 - private: - interface: 3 - vlan: 1000 - network: 192.168.2.0 - mask: 24 - public: - interface: 2 - vlan: 80 - network: 100.64.200.0 - mask: 24 - gateway: 100.64.200.1 - dns: - - 8.8.8.8 - - 8.8.4.4 -############################################################################## jumphost: name: CI-POD1-HOST node: &nodeparams -- cgit 1.2.3-korg