diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-13 21:58:42 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-14 20:23:40 +0100 |
| commit | 263ebb9f3ad01412423e6d0009dac8c46e93f20a (patch) | |
| tree | 80fc121494b296520f488859077167d9dac7e6dc /labs/zte/pod1.yaml | |
| parent | e90ad8ca2c2b633ad13a8d533b555e09fb22f27b (diff) | |
[PDF] zte-pod*: Move net_config to IDF
Drop 'fixed_ips', which is a leftover from early net_config
implementation.
To maintain compatibility with the only 'fixed_ips' consumer (Daisy),
add 'address' on the first jumpserver interface to leverage Daisy's
fallback path for determining the gateway.
While at it, add/update copyright headers.
Change-Id: I7c4cb5997e368503ab0b30903e5c0c58e13fe408
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'labs/zte/pod1.yaml')
| -rw-r--r-- | labs/zte/pod1.yaml | 47 |
1 files changed, 8 insertions, 39 deletions
diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml index 950c2d89..700c5d0c 100644 --- a/labs/zte/pod1.yaml +++ b/labs/zte/pod1.yaml @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2018 ZTE, 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 +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## --- ### ZTE POD 1 descriptor file ### # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml @@ -10,41 +17,6 @@ details: type: production link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab ############################################################################## -net_config: - # NOTE: Network names are likely to change after the PDF spec is updated - oob: - interface: 0 - ip-range: 192.168.1.101-192.168.1.105 - vlan: null - admin: - interface: 0 - vlan: native - network: 10.10.6.0 - mask: 24 - mgmt: - interface: 1 - vlan: 161 - network: 192.168.61.0 - mask: 24 - storage: - interface: 2 - vlan: 162 - network: 192.168.62.0 - mask: 24 - private: - interface: 3 - vlan: 1120 - network: 192.168.63.0 - mask: 24 - public: - interface: 4 - vlan: 163 - network: 172.60.0.0 - mask: 24 - gateway: 172.60.0.1 - dns: - - 172.10.0.1 -############################################################################## jumphost: name: pod1-jump node: @@ -104,10 +76,7 @@ jumphost: interfaces: - mac_address: "74:4a:a4:00:91:b3" speed: 1gb - fixed_ips: - admin: 10.20.6.1 - mgmt: 192.168.61.238 - public: 172.60.0.238 + address: 10.20.6.1 nodes: - name: pod1-node1 node: &nodeparas |