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/bii | |
| 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/bii')
| -rw-r--r-- | labs/bii/idf-pod1.yaml | 33 | ||||
| -rw-r--r-- | labs/bii/pod1.yaml | 75 |
2 files changed, 53 insertions, 55 deletions
diff --git a/labs/bii/idf-pod1.yaml b/labs/bii/idf-pod1.yaml new file mode 100644 index 00000000..8c358a9c --- /dev/null +++ b/labs/bii/idf-pod1.yaml @@ -0,0 +1,33 @@ +--- +### This is a BII POD1 Installer descriptor file ### + +idf: + version: 0.1 + net_config: + admin: + interface: 0 + vlan: 0 + network: 10.20.0.0 + mask: 24 + gateway: 10.20.0.1 + dns: 10.20.0.1 + mgmt: + interface: 0 + vlan: 102 + network: 192.168.102.0 + mask: 24 + storage: + interface: 0 + vlan: 101 + network: 192.168.101.0 + mask: 24 + private: + interface: 0 + vlan: 103 + network: 192.168.103.0 + mask: 24 + public: + interface: 1 + vlan: 0 + network: 192.168.20.0 + mask: 24 diff --git a/labs/bii/pod1.yaml b/labs/bii/pod1.yaml index 159401b7..f6ad478f 100644 --- a/labs/bii/pod1.yaml +++ b/labs/bii/pod1.yaml @@ -8,35 +8,6 @@ details: type: development link: https://wiki.opnfv.org/display/pharos/BII ################################################### -net_config: - admin: - interface: 0 - vlan: 0 - network: 10.20.0.0 - mask: 24 - gateway: 10.20.0.1 - dns: 10.20.0.1 - mgmt: - interface: 0 - vlan: 102 - network: 192.168.102.0 - mask: 24 - storage: - interface: 0 - vlan: 101 - network: 192.168.101.0 - mask: 24 - private: - interface: 0 - vlan: 103 - network: 192.168.103.0 - mask: 24 - public: - interface: 1 - vlan: 0 - network: 192.168.20.0 - mask: 24 -################################################### jumphost: name: fuel node: @@ -86,11 +57,10 @@ jumphost: address: 192.168.20.200 mac_address: "44:A8:42:1A:68:78" interfaces: # physical interface list - - "44:a8:42:15:10:03" - - "44:a8:42:15:10:04" - fixed_ips: - admin: 10.20.0.2 - public: 192.168.20.5 + - mac_address: "44:a8:42:15:10:03" + address: 10.20.0.2 + - mac_address: "44:a8:42:15:10:04" + address: 192.168.20.5 ################################################### nodes: - name: compute1 @@ -134,9 +104,8 @@ nodes: address: 192.168.20.201 mac_address: "44:A8:42:1A:70:BE" interfaces: # physical interface list - - "44:a8:42:14:ee:64" - fixed_ips: - admin: 10.20.0.4 + - mac_address: "44:a8:42:14:ee:64" + address: 10.20.0.4 ######################################## - name: compute2 node: *nodeparas @@ -146,9 +115,8 @@ nodes: address: 192.168.20.202 mac_address: "44:A8:42:1A:76:26" interfaces: - - "44:a8:42:14:cb:31" - fixed_ips: - admin: 10.20.0.5 + - mac_address: "44:a8:42:14:cb:31" + address: 10.20.0.5 ######################################## - name: controller1 node: *nodeparas @@ -158,11 +126,10 @@ nodes: address: 192.168.20.203 mac_address: "44:A8:42:1A:49:A5" interfaces: - - "44:a8:42:14:cd:0d" - - "44:a8:42:14:cd:0e" - fixed_ips: - admin: 10.20.0.6 - public: 192.168.20.12 + - mac_address: "44:a8:42:14:cd:0d" + address: 10.20.0.6 + - mac_address: "44:a8:42:14:cd:0e" + address: 192.168.20.12 ######################################## - name: controller2 node: *nodeparas @@ -172,11 +139,10 @@ nodes: address: 192.168.20.204 mac_address: "44:A8:42:1A:76:2C" interfaces: - - "44:a8:42:15:1b:e6" - - "44:a8:42:15:1b:e7" - fixed_ips: - admin: 10.20.0.7 - public: 192.168.20.13 + - mac_address: "44:a8:42:15:1b:e6" + address: 10.20.0.7 + - mac_address: "44:a8:42:15:1b:e7" + address: 192.168.20.13 ######################################## - name: controller3 node: *nodeparas @@ -186,8 +152,7 @@ nodes: address: 192.168.20.205 mac_address: "44:A8:42:13:D5:1B" interfaces: - - "44:a8:42:14:fc:1a" - - "44:a8:42:14:fc:1b" - fixed_ips: - admin: 10.20.0.8 - public: 192.168.20.14 + - mac_address: "44:a8:42:14:fc:1a" + address: 10.20.0.8 + - mac_address: "44:a8:42:14:fc:1b" + address: 192.168.20.14 |