diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2018-01-15 21:45:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-15 21:45:00 +0000 |
| commit | 5a013a2f7b2b64b91d2f61ec1a1f1378a5d62977 (patch) | |
| tree | 01390b984fbd6d840971b2645c3abd1544573a0c /labs/ericsson | |
| parent | 277aab79e2efa7acc1accd7469d10bb1029882c2 (diff) | |
| parent | 1e35f14466291b34ec10e8c63e070d9d50681593 (diff) | |
Merge changes from topic 'move-net_config-idf'
* changes:
[PDF] Daisy, Fuel: Drop support for PDF net_config
[PDF] zte-pod*: Move net_config to IDF
[PDF] lf-pod*: Drop 'fixed_ips'
[PDD] ericsson-pod*: Move net_config to IDF
[PDF] bii-pod*: Move net_config to IDF
[PDF] arm-pod*: Move net_config to IDF
[PDF] Daisy, Fuel: Add support for IDF net_config
Diffstat (limited to 'labs/ericsson')
| -rw-r--r-- | labs/ericsson/idf-pod1.yaml | 36 | ||||
| -rw-r--r-- | labs/ericsson/pod1.yaml | 40 |
2 files changed, 36 insertions, 40 deletions
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 |