From c01d68e8a9ef2f979cfbe91e0ee0b14f99271444 Mon Sep 17 00:00:00 2001 From: agardner Date: Wed, 20 Dec 2017 12:18:53 -0500 Subject: [PATCH] PDF is not to contain net_config Moved net_config from PDF to IDF for discussion on what the idf should look like The PDF spec is static and should not change. All changes needed for installers should be put in other descriptor files. (senario and installer descriptor files) Change-Id: I79f6c751cabc69bded255ce0471e8512c656c259 Signed-off-by: agardner --- labs/lf/idf-pod2.yaml | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ labs/lf/idf-pod5.yaml | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ labs/lf/pod2.yaml | 36 ------------------------- labs/lf/pod5.yaml | 34 ------------------------ 4 files changed, 143 insertions(+), 70 deletions(-) create mode 100644 labs/lf/idf-pod2.yaml create mode 100644 labs/lf/idf-pod5.yaml diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml new file mode 100644 index 00000000..78c916ef --- /dev/null +++ b/labs/lf/idf-pod2.yaml @@ -0,0 +1,73 @@ +############################################################################## +# Copyright (c) 2017 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 +############################################################################## +--- +### LF POD 5 installer descriptor file ### + +idf: + version: 0.1 + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: 172.30.8.65-172.30.8.75 + vlan: 410 + admin: + interface: 0 + vlan: native + network: 192.168.11.0 # Untagged, 'PXE/Admin' on wiki, different IP + mask: 24 + mgmt: + interface: 0 + vlan: 300 + network: 10.167.4.0 # Tagged, 'vlan 300' on wiki + mask: 24 + storage: + interface: 3 + vlan: 301 + network: 10.2.0.0 # Tagged, not the same with 'storage' on wiki + mask: 24 + private: + interface: 1 + vlan: 1000 + network: 10.1.0.0 # Tagged, not the same with 'private' on wiki + mask: 24 + public: + interface: 2 + vlan: native + network: 172.30.10.0 # Untagged, 'public' on wiki + mask: 24 + gateway: 172.30.10.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: '' + mgmt: '' + private: '' + public: '' + network: + node: + # 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 + - '' + - '' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '' + - '' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/lf/idf-pod5.yaml b/labs/lf/idf-pod5.yaml new file mode 100644 index 00000000..e0e4af28 --- /dev/null +++ b/labs/lf/idf-pod5.yaml @@ -0,0 +1,70 @@ +############################################################################## +# Copyright (c) 2017 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 +############################################################################## +--- +### LF POD 5 installer descriptor file ### + +idf: + version: 0.1 + net_config: + oob: + interface: 0 + ip-range: 172.30.8.89-172.30.8.94 + vlan: 410 + admin: + interface: 0 + vlan: native + network: 10.20.0.128 + mask: 25 + gateway: 10.20.0.129 + dns: 10.20.0.129 + mgmt: + interface: 1 + vlan: 450 + network: 192.168.0.128 + mask: 25 + storage: + interface: 2 + vlan: 451 + network: 192.168.1.128 + mask: 25 + private: + interface: 1 + vlan: 452 + network: 192.168.2.128 + mask: 25 + public: + interface: 2 + vlan: 415 + network: 172.30.13.64 + mask: 26 + fuel: + jumphost: + bridges: + admin: '' + mgmt: '' + private: '' + public: '' + network: + node: + # 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 + - '' + - '' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '' + - '' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/lf/pod2.yaml b/labs/lf/pod2.yaml index e9ede116..eb2efb23 100644 --- a/labs/lf/pod2.yaml +++ b/labs/lf/pod2.yaml @@ -9,42 +9,6 @@ details: type: production link: https://wiki.opnfv.org/display/pharos/LF+POD+2 ############################################################################## -net_config: - # NOTE: Network names are likely to change after the PDF spec is updated - oob: - interface: 0 - ip-range: 172.30.8.65-172.30.8.75 - vlan: 410 - admin: - interface: 0 - vlan: native - network: 192.168.11.0 # Untagged, 'PXE/Admin' on wiki, different IP - mask: 24 - mgmt: - interface: 0 - vlan: 300 - network: 10.167.4.0 # Tagged, 'vlan 300' on wiki - mask: 24 - storage: - interface: 3 - vlan: 301 - network: 10.2.0.0 # Tagged, not the same with 'storage' on wiki - mask: 24 - private: - interface: 1 - vlan: 1000 - network: 10.1.0.0 # Tagged, not the same with 'private' on wiki - mask: 24 - public: - interface: 2 - vlan: native - network: 172.30.10.0 # Untagged, 'public' on wiki - mask: 24 - gateway: 172.30.10.1 - dns: - - 8.8.8.8 - - 8.8.4.4 -############################################################################## jumphost: name: pod2-jump node: diff --git a/labs/lf/pod5.yaml b/labs/lf/pod5.yaml index 7da6abcd..50d0094d 100644 --- a/labs/lf/pod5.yaml +++ b/labs/lf/pod5.yaml @@ -8,40 +8,6 @@ details: location: Portland, Oregon, USA type: development link: https://wiki.opnfv.org/display/pharos/LF+POD+5 - -net_config: - oob: - interface: 0 - ip-range: 172.30.8.89-172.30.8.94 - vlan: 410 - admin: - interface: 0 - vlan: native - network: 10.20.0.128 - mask: 25 - gateway: 10.20.0.129 - dns: 10.20.0.129 - mgmt: - interface: 1 - vlan: 450 - network: 192.168.0.128 - mask: 25 - storage: - interface: 2 - vlan: 451 - network: 192.168.1.128 - mask: 25 - private: - interface: 1 - vlan: 452 - network: 192.168.2.128 - mask: 25 - public: - interface: 2 - vlan: 415 - network: 172.30.13.64 - mask: 26 - jumphost: name: pod5-jump node: &nodeparas -- 2.16.6