From 35f02014717f5305bcf1c7df2d8a3df08447e27d Mon Sep 17 00:00:00 2001 From: Blaisonneau David Date: Thu, 15 Mar 2018 16:33:01 +0100 Subject: Introduction of PDF/IDF this is a proposition of self sufficient PDF/IDF to describe the POD where XCI is running. The PDF [Pod Description File] is describing the physical level of the POD where XCI will run the installer. It lists servers and their description (CPU/RAM/DISK/NICS) The IDF [Installer Description File] is describing how the installers will use the POD. 2 sections are today important in this IDF: - idf.net_config is describing the network topology - xci section is set to describe how common steps (network, nfs, ceph,...) of XCI will use the pod. Another section of IDF idf.[installer], curretnly empty, will contain all pod specificities that are linked to an installer (osa, kolla, k8s,...) and not shared with the others. Those 2 files are describing the vitual pod as it is already deployed by the XCI. Those default files can be replaced by the ones describing the target pod (done manually or with the CI). It would then be to the install process to take into account these files (to be done). Change-Id: I3dcbd965f8c84b03d34eb0fd68599d7bec402dbd Signed-off-by: Blaisonneau David --- xci/var/idf.yml | 69 +++++++++++++++++++++++ xci/var/pdf.yml | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 237 insertions(+) create mode 100644 xci/var/idf.yml create mode 100644 xci/var/pdf.yml diff --git a/xci/var/idf.yml b/xci/var/idf.yml new file mode 100644 index 00000000..8d9352b6 --- /dev/null +++ b/xci/var/idf.yml @@ -0,0 +1,69 @@ +--- +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 Orange 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 +############################################################################## + +idf: + version: 0.1 + osa: + kolla: + k8s: + net_config: &net_config + admin: + interface: 0 + network: 172.29.236.0 + mask: 22 + storage: + interface: 1 + network: 172.29.240.0 + mask: 22 + public: + interface: 2 + network: 192.168.122.0 + mask: 24 + gateway: 192.168.122.1 + dns: 8.8.8.8 + private: + interface: 3 + network: 172.29.244.0 + mask: 22 + +xci: + pod_name: vpod1 + net_config: *net_config + nodes_roles: + opnfv_host: [opnfv_host] + node1: [compute, storage] + node2: [compute, storage] + node3: [controller] + node4: [controller] + node5: [controller] + + # net_config network to be used by the PXE + pxe_network: public + + # As the MAC of generated bridges are generated, we use a list of local + # bridges to create libvirt networks + jumphost_interfaces_bridges: + - name: virbr0 + ip: 192.168.122.1 + + extra_addresses: + opnfv_host: 192.168.122.2 + + # network mapping + network_mapping: + # Management network used by installer components to communicate + net-mgmt: admin + # Storage Network + net-storage: storage + # Internal network for communication between VNF + net-internal: private + # Public network for VNF remote acces (ext-net in Openstack) + net-vnf: public diff --git a/xci/var/pdf.yml b/xci/var/pdf.yml new file mode 100644 index 00000000..bb9a5f55 --- /dev/null +++ b/xci/var/pdf.yml @@ -0,0 +1,168 @@ +--- +############################################################################## +# 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 +############################################################################## + +details: + pod_owner: OPNFV + contact: N/A + lab: OPNFV LaaS + location: N/A + type: production + link: http://wiki.opnfv.org/ +############################################################################## +jumphost: + name: jumphost + node: + disks: + os: + remote_management: + interfaces: +############################################################################## +nodes: + - name: node1 + node: &nodeparams + type: virtual + vendor: libvirt + model: pc + arch: x86_64 + cpus: 6 + cpu_cflags: host-model + cores: 6 + memory: 12G + disks: &disks + - name: disk1 + disk_capacity: 80G + disk_type: hdd + disk_interface: sata + disk_rotation: + remote_params: &remote_params + type: + - ipmi: [2.0] + user: admin + pass: password + remote_management: + <<: *remote_params + address: 192.168.122.1:625 + mac_address: "52:54:00:fe:3b:01" + interface_common_nic1: &interface_common_nic1 + name: nic1 + speed: + features: + vlan: 10 + 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:fe:3b:01" + address: 172.29.236.11 + <<: *interface_common_nic1 + - mac_address: "52:54:00:fe:3b:01" + address: 172.29.244.11 + <<: *interface_common_nic2 + - mac_address: "52:54:00:fe:3b:01" + address: 192.168.122.3 + <<: *interface_common_nic3 + - mac_address: "52:54:00:fe:3b:01" + address: 172.29.240.11 + <<: *interface_common_nic4 + ############################################################################## + - name: node2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.122.1:626 + mac_address: "52:54:00:b9:d4:87" + interfaces: + - mac_address: "52:54:00:b9:d4:87" + address: 172.29.236.12 + <<: *interface_common_nic1 + - mac_address: "52:54:00:b9:d4:87" + address: 172.29.244.12 + <<: *interface_common_nic2 + - mac_address: "52:54:00:b9:d4:87" + address: 192.168.122.4 + <<: *interface_common_nic3 + - mac_address: "52:54:00:b9:d4:87" + address: 172.29.240.12 + <<: *interface_common_nic4 + ############################################################################## + - name: node3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.122.1:627 + mac_address: "52:54:00:6d:0e:d1" + interfaces: + - mac_address: "52:54:00:6d:0e:d1" + address: 172.29.236.13 + <<: *interface_common_nic1 + - mac_address: "52:54:00:6d:0e:d1" + address: 172.29.244.13 + <<: *interface_common_nic2 + - mac_address: "52:54:00:6d:0e:d1" + address: 192.168.122.5 + <<: *interface_common_nic3 + - mac_address: "52:54:00:6d:0e:d1" + address: 172.29.240.13 + <<: *interface_common_nic4 + ############################################################################## + - name: node4 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.122.1:628 + mac_address: "52:54:00:95:02:10" + interfaces: + - mac_address: "52:54:00:95:02:10" + address: 172.29.236.14 + <<: *interface_common_nic1 + - mac_address: "52:54:00:95:02:10" + address: 172.29.244.14 + <<: *interface_common_nic2 + - mac_address: "52:54:00:95:02:10" + address: 192.168.122.6 + <<: *interface_common_nic3 + - mac_address: "52:54:00:95:02:10" + address: 172.29.240.14 + <<: *interface_common_nic4 + ############################################################################## + - name: node5 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.122.1:629 + mac_address: "52:54:00:84:fa:19" + interfaces: + - mac_address: "52:54:00:84:fa:19" + address: 172.29.236.15 + <<: *interface_common_nic1 + - mac_address: "52:54:00:84:fa:19" + address: 172.29.244.15 + <<: *interface_common_nic2 + - mac_address: "52:54:00:84:fa:19" + address: 192.168.122.7 + <<: *interface_common_nic3 + - mac_address: "52:54:00:84:fa:19" + address: 172.29.240.15 + <<: *interface_common_nic4 -- cgit 1.2.3-korg