summaryrefslogtreecommitdiffstats
path: root/labs/arm/pod6.yaml
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-13 19:51:29 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-14 20:21:26 +0100
commitb43e4a37601ba2e2345adb677a166caae79a502b (patch)
tree12fcdee302520c2ed1cbcfef9798e052599ea5da /labs/arm/pod6.yaml
parentebe465854cbae270526986ddf781726e2551733a (diff)
[PDF] arm-pod*: Move net_config to IDF
While at it, drop 'fixed_ips', which is a leftover from early net_config implementation and is not currently used by the Fuel installer (only Daisy seems to use 'fixed_ips', but falls back to using 'address' of the first interface when 'fixed_ips' is not present). Keep 'address: 192.168.11' on jumpserver first interface for Daisy compatibility. Change-Id: I83455a45a2a19fde6b9fb8b7f0fa8872b1291ab0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'labs/arm/pod6.yaml')
-rw-r--r--labs/arm/pod6.yaml66
1 files changed, 8 insertions, 58 deletions
diff --git a/labs/arm/pod6.yaml b/labs/arm/pod6.yaml
index f4f92ddd..b2d3419e 100644
--- a/labs/arm/pod6.yaml
+++ b/labs/arm/pod6.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# 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
+##############################################################################
---
### Enea ARM POD 6 descriptor file ###
@@ -9,40 +16,6 @@ details:
type: production
link: https://wiki.opnfv.org/display/pharos/Enea+Hosting
##############################################################################
-net_config:
- oob:
- ip-range: 10.0.1.54-10.0.1.58
- vlan: native
- admin:
- interface: 0
- vlan: native
- network: 192.168.11.0
- mask: 24
- mgmt:
- interface: 1
- vlan: 2323
- network: 172.16.10.0
- mask: 24
- storage:
- interface: 1
- vlan: 2324
- network: 10.2.0.0
- mask: 24
- private:
- interface: 1
- vlan: 2325
- network: 10.1.0.0
- mask: 24
- public:
- interface: 1
- vlan: native
- network: 10.0.15.0
- mask: 24
- gateway: 10.0.15.254
- dns:
- - 8.8.8.8
- - 8.8.4.4
-##############################################################################
jumphost:
name: jenkins-slave-arm-pod6
node:
@@ -86,6 +59,7 @@ jumphost:
interfaces:
## eth0, Not connected for now
- mac_address: "00:01:73:02:36:d4"
+ address: 192.168.11.1
speed: 1gb
features: ''
## eth1, Connected, used only for admin/PXE
@@ -100,10 +74,6 @@ jumphost:
- mac_address: "00:01:73:02:36:d7"
speed: 10gb
features: ''
- fixed_ips:
- admin: 192.168.11.1
- mgmt: 172.16.10.1
- public: 10.0.15.9
##############################################################################
nodes:
- name: cn8890-24
@@ -150,10 +120,6 @@ nodes:
- mac_address: "1c:1b:0d:e8:fa:87"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.2
- mgmt: 172.16.10.142
- public: 10.0.15.142
############################################################################
- name: cn8890-25
node: *nodeparams
@@ -181,10 +147,6 @@ nodes:
- mac_address: "1c:1b:0d:e8:fb:a9"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.3
- mgmt: 172.16.10.143
- public: 10.0.15.143
############################################################################
- name: cn8890-26
node: *nodeparams
@@ -212,10 +174,6 @@ nodes:
- mac_address: "1c:1b:0d:e8:fa:69"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.4
- mgmt: 172.16.10.144
- public: 10.0.15.144
############################################################################
- name: cn8890-27
node: *nodeparams
@@ -243,10 +201,6 @@ nodes:
- mac_address: "1c:1b:0d:e8:fb:1d"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.5
- mgmt: 172.16.10.145
- public: 10.0.15.145
############################################################################
- name: cn8890-28
node: *nodeparams
@@ -274,7 +228,3 @@ nodes:
- mac_address: "1c:1b:0d:e8:fb:81"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.6
- mgmt: 172.16.10.146
- public: 10.0.15.146