diff options
| author |   Manuel Buil <mbuil@suse.com> | 2018-08-09 15:53:40 +0200 |
|---|---|---|
| committer | Manuel Buil <mbuil@suse.com> | 2018-09-28 17:47:00 +0200 |
| commit | 3fe75598de97c73c95d83739e6ed11277b619988 (patch) | |
| tree | 5012ff76ed7ed9d00f02181d0de369cf5aa29b05 /xci/var | |
| parent | 013bfffe38ab9a6c86a4a6e3bc2d08a5b5aedcbd (diff) | |
[baremetal] idf for opnfv_vm and update the pdf
Physical hardware PODs provide a pdf and a idf to describe hardware and other
information (e.g. what is the purpose for each interface). To reuse the
same code for opnfv vm and also become consistent, we should also describe
the opnfv vm with an idf and a pdf. This patch simplifies what needs to
be done for baremetal, especially for this (future) patch:
https://gerrit.opnfv.org/gerrit/#/c/60797/11
As we add an idf, we should update dynamic_inventory and how we create
the opnfv vm. Obviously, he opnfv_vm.yml gets removed.
Change-Id: I930728474631fc214e4a9adc8581e0c16d230176
Signed-off-by: Manuel Buil <mbuil@suse.com>
Diffstat (limited to 'xci/var')
| -rw-r--r-- | xci/var/opnfv_vm_idf.yml | 19 | ||||
| -rw-r--r-- | xci/var/opnfv_vm_pdf.yml (renamed from xci/var/opnfv_vm.yml) | 34 |
2 files changed, 29 insertions, 24 deletions
diff --git a/xci/var/opnfv_vm_idf.yml b/xci/var/opnfv_vm_idf.yml new file mode 100644 index 00000000..fa647287 --- /dev/null +++ b/xci/var/opnfv_vm_idf.yml @@ -0,0 +1,19 @@ +--- +############################################################################## +# Copyright (c) 2017 Ericsson 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 +############################################################################## +opnfv_vm_idf: + version: 0.1 + net_config: &net_config + admin: + interface: 0 + network: 192.168.122.0 + mask: 24 + mgmt: + interface: 1 + network: 172.29.236.0 + mask: 22 diff --git a/xci/var/opnfv_vm.yml b/xci/var/opnfv_vm_pdf.yml index 17f5038c..51371388 100644 --- a/xci/var/opnfv_vm.yml +++ b/xci/var/opnfv_vm_pdf.yml @@ -6,7 +6,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -opnfv_vm: +opnfv_vm_pdf: name: opnfv node: &nodeparams type: virtual @@ -36,32 +36,18 @@ opnfv_vm: name: nic1 speed: features: - vlan: 10 + vlan: native interface_common_nic2: &interface_common_nic2 name: nic2 speed: features: - vlan: 20 - interface_common_nic3: &interface_common_nic3 - name: nic3 - speed: - features: vlan: native - interface_common_nic4: &interface_common_nic4 - name: nic4 - speed: - features: - vlan: 30 interfaces: - - mac_address: "52:54:00:33:82:d0" - address: 172.29.236.10 - <<: *interface_common_nic1 - - mac_address: "52:54:00:33:82:d0" - address: 172.29.244.10 - <<: *interface_common_nic2 - - mac_address: "52:54:00:33:82:d0" - address: 192.168.122.2 - <<: *interface_common_nic3 - - mac_address: "52:54:00:33:82:d0" - address: 172.29.240.10 - <<: *interface_common_nic4 + - mac_address: "52:54:00:33:82:d0" + address: 192.168.122.2 + gateway: 192.168.122.1 + <<: *interface_common_nic1 + - mac_address: "52:54:00:33:82:d1" + address: 172.29.236.10 + gateway: 172.29.236.1 + <<: *interface_common_nic2 |