diff options
Diffstat (limited to 'xci/var')
-rw-r--r-- | xci/var/ericsson-pod2-idf.yml | 187 | ||||
-rw-r--r-- | xci/var/ericsson-pod2-pdf.yml | 269 | ||||
-rw-r--r-- | xci/var/idf.yml | 122 | ||||
-rw-r--r-- | xci/var/lf-pod4-idf.yml | 222 | ||||
-rw-r--r-- | xci/var/lf-pod4-pdf.yml | 198 | ||||
-rw-r--r-- | xci/var/opnfv.yml | 14 | ||||
-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 |
8 files changed, 1004 insertions, 61 deletions
diff --git a/xci/var/ericsson-pod2-idf.yml b/xci/var/ericsson-pod2-idf.yml new file mode 100644 index 00000000..2839b120 --- /dev/null +++ b/xci/var/ericsson-pod2-idf.yml @@ -0,0 +1,187 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, 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 +############################################################################## +--- +### ERICSSON POD 2 installer descriptor file ### +idf: + version: 0.1 + installer: ['apex', 'compass4nfv', 'daisy', 'osa', 'osh'] + net_config: &net_config + admin: + interface: 2 + network: 192.168.122.0 # Untagged, 'PXE/Admin' on wiki, different IP + mask: 24 + mgmt: + interface: 1 + network: 172.29.236.0 + mask: 22 + storage: + interface: 3 + network: 172.29.240.0 # Tagged, not the same with 'storage' on wiki + mask: 22 + private: + interface: 4 + network: 172.29.242.0 # Tagged, not the same with 'private' on wiki + mask: 22 + public: + interface: 2 + network: 192.168.122.0 # Untagged, 'public' on wiki + mask: 24 + gateway: 192.168.122.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + osa: &idf_osa + nodes_roles: + opnfv: [deployment] + node1: [controller] + node2: [compute, storage] + node3: [compute, storage] + node4: [controller] + node5: [controller] + groups: + openstack: + - controller + - compute + - storage + hostnames: + opnfv: opnfv + node1: controller00 + node2: compute00 + node3: compute01 + node4: controller01 + node5: controller02 + network: + # 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 + deployment_host_interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'ens1f1' #should be eno49 but it is currently broken + - 'ens1f0' + - 'ens1f1' + - 'ens2f0' + - 'ens2f1' + osh: &idf_osh + nodes_roles: + opnvf: [opnfv] + node1: [kube-master, etcd, vault] + node2: [kube-node] + node3: [kube-node] + node4: [kube-master, etcd, vault] + node5: [kube-master, etcd, vault] + groups: + k8s-cluster: + - kube-node + - kube-master + hostnames: + opnfv: opnfv + node1: master1 + node2: node1 + node3: node2 + node4: master2 + node5: master3 + network: + # 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 + deployment_host_interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'ens1f1' #should be eno49 but it is currently broken + - 'ens1f0' + - 'ens1f1' + - 'ens2f0' + - 'ens2f1' + kubespray: &idf_kubespray + nodes_roles: + opnvf: [opnfv] + node1: [kube-master, etcd, vault] + node2: [kube-node] + node3: [kube-node] + node4: [kube-master, etcd, vault] + node5: [kube-master, etcd, vault] + groups: + k8s-cluster: + - kube-node + - kube-master + hostnames: + opnfv: opnfv + node1: master1 + node2: node1 + node3: node2 + node4: master2 + node5: master3 + network: + # 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 + deployment_host_interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'ens1f1' #should be eno49 but it is currently broken + - 'ens1f0' + - 'ens1f1' + - 'ens2f0' + - 'ens2f1' + +xci: + pod_name: pod1 + net_config: *net_config + flavors: + mini: + - opnfv + - node1 + - node2 + noha: + - opnfv + - node1 + - node2 + - node3 + ha: + - opnfv + - node1 + - node2 + - node3 + - node4 + - node5 + + # 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: 192.168.122.2 + + installers: + osa: *idf_osa + kubespray: *idf_kubespray + osh: *idf_osh diff --git a/xci/var/ericsson-pod2-pdf.yml b/xci/var/ericsson-pod2-pdf.yml new file mode 100644 index 00000000..4c7271ec --- /dev/null +++ b/xci/var/ericsson-pod2-pdf.yml @@ -0,0 +1,269 @@ +--- +### POD descriptor file ### + +version: 1.0 +details: + pod_owner: Jose Lausuch + contact: jose.lausuch@ericsson.com + lab: Ericsson + location: Rosersberg, Sweden + type: production + link: https://wiki.opnfv.org/display/pharos/CI-ERICSSON-POD2 +############################################################################## +jumphost: + name: CI-POD2-HOST + node: &nodeparams + type: baremetal + vendor: HP + model: ProLiant BL460c Gen9 + arch: x86_64 + cpus: 2 + cpu_cflags: haswell + cores: 12 + memory: 128G + disks: &disks + - name: 'disk1' + disk_capacity: 1200G + disk_type: hdd + disk_interface: scsi + disk_rotation: 15000 + os: ubuntu-16.04 + remote_params: &remoteparas + type: ipmi + versions: + - 1.0 + - 2.0 + user: opnfv + pass: Winter2017 + remote_management: + <<: *remoteparas + address: 172.16.2.11 + mac_address: "58:20:B1:01:8A:F2" + interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + address: 172.16.2.11 + mac_address: "ec:b1:d7:a1:a1:10" + vlan: native + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + address: 172.29.236.10 + mac_address: "5c:b9:01:8b:9f:e8" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + address: 192.168.122.2 + mac_address: "5c:b9:01:8b:9f:e9" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + address: 172.29.240.10 + mac_address: "5c:b9:01:8b:9f:ec" + vlan: 3010 + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + address: 172.29.242.10 + mac_address: "5c:b9:01:8b:9f:ed" + vlan: 3010 +############################################################################## +nodes: + - name: node1 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.12 + mac_address: "58:20:B1:01:8B:F0" + interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:44:a0" + address: "192.168.122.3" + vlan: native + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:94" + address: "172.29.236.11" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:95" + address: "192.168.122.3" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:80" + address: "172.29.240.11" + vlan: 3010 + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:81" + address: "172.29.242.11" + vlan: 3010 + ############################################################################ + - name: node2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.13 + mac_address: "58:20:B1:01:8E:FC" + interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:44:80" + address: "192.168.122.4" + vlan: native + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:30" + address: "172.29.236.12" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:31" + address: "192.168.122.4" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:99:64" + address: "172.29.240.12" + vlan: 3010 + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:99:65" + address: "172.29.242.12" + vlan: 3010 + ############################################################################ + - name: node3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.14 + mac_address: "58:20:B1:01:8D:32" + interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:43:c0" + address: "192.168.122.5" + vlan: native + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:9d:4c" + address: "172.29.236.13" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:9d:4d" + address: "192.168.122.5" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:9d:6c" + address: "172.29.240.13" + vlan: 3010 + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:9d:6d" + address: "172.29.242.13" + vlan: 3010 + ############################################################################ + - name: node4 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.15 + mac_address: "58:20:B1:01:8B:FC" + interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a1:8b:d0" + address: "192.168.122.6" + vlan: native + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a5:fc" + address: "172.29.236.14" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a5:fd" + address: "192.168.122.6" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:08" + address: "172.29.240.14" + vlan: 3010 + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:09" + address: "172.29.242.14" + vlan: 3010 + ############################################################################ + - name: node5 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.16 + mac_address: "58:20:B1:01:8F:EA" + interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a1:bd:60" + address: "192.168.122.7" + vlan: native + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:e8" + address: "172.29.236.15" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:e9" + address: "192.168.122.7" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:97:14" + address: "172.29.240.15" + vlan: 3010 + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:97:15" + address: "172.29.242.15" + vlan: 3010 + diff --git a/xci/var/idf.yml b/xci/var/idf.yml index 4d743cda..8ed55f6f 100644 --- a/xci/var/idf.yml +++ b/xci/var/idf.yml @@ -13,6 +13,10 @@ idf: version: 0.1 net_config: &net_config admin: + interface: 2 + network: 192.168.122.0 + mask: 22 + mgmt: interface: 0 network: 172.29.236.0 mask: 22 @@ -25,34 +29,13 @@ idf: network: 192.168.122.0 mask: 24 gateway: 192.168.122.1 - dns: 192.168.122.1 + dns: + - 192.168.122.1 private: interface: 3 network: 172.29.244.0 mask: 22 - -xci: - pod_name: vpod1 - net_config: *net_config - flavors: - mini: - - opnfv - - node1 - - node2 - noha: - - opnfv - - node1 - - node2 - - node3 - ha: - - opnfv - - node1 - - node2 - - node3 - - node4 - - node5 - - osa: + osa: &idf_osa nodes_roles: opnfv: [deployment] node1: [controller] @@ -72,9 +55,20 @@ xci: node3: compute01 node4: controller01 node5: controller02 - kubespray: + network: + # network mapping + network_mapping: + # Management network used by installer components to communicate + net-mgmt: mgmt + # 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 + kubespray: &idf_kubespray nodes_roles: - opnvf: [opnfv] + opnfv: [opnfv] node1: [kube-master, etcd, vault] node2: [kube-node] node3: [kube-node] @@ -91,7 +85,67 @@ xci: node3: node2 node4: master2 node5: master3 - + network: + # network mapping + network_mapping: + # Management network used by installer components to communicate + net-mgmt: mgmt + # 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 + osh: &idf_osh + nodes_roles: + opnfv: [opnfv] + node1: [kube-master, etcd, vault] + node2: [kube-node] + node3: [kube-node] + node4: [kube-master, etcd, vault] + node5: [kube-master, etcd, vault] + groups: + k8s-cluster: + - kube-node + - kube-master + hostnames: + opnfv: opnfv + node1: master1 + node2: node1 + node3: node2 + node4: master2 + node5: master3 + network: + # network mapping + network_mapping: + # Management network used by installer components to communicate + net-mgmt: mgmt + # 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 +xci: + pod_name: vpod1 + net_config: *net_config + flavors: + mini: + - opnfv + - node1 + - node2 + noha: + - opnfv + - node1 + - node2 + - node3 + ha: + - opnfv + - node1 + - node2 + - node3 + - node4 + - node5 # net_config network to be used by the PXE pxe_network: public @@ -104,13 +158,7 @@ xci: extra_addresses: opnfv: 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 + installers: + osa: *idf_osa + kubespray: *idf_kubespray + osh: *idf_osh diff --git a/xci/var/lf-pod4-idf.yml b/xci/var/lf-pod4-idf.yml new file mode 100644 index 00000000..55ca6b63 --- /dev/null +++ b/xci/var/lf-pod4-idf.yml @@ -0,0 +1,222 @@ +############################################################################## +# Copyright (c) 2018 Linux Foundation, 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 +############################################################################## +--- +### LF POD 4 installer descriptor file ### + +idf: + version: 0.1 + installer: ['apex', 'compass4nfv', 'daisy', 'fuel', 'osa', 'osh'] + net_config: &net_config + oob: + interface: 0 + ip-range: 172.30.8.83-172.30.8.88 + vlan: 410 + mask: 24 + admin: + interface: 0 + vlan: native + network: 192.168.122.0 + gateway: 192.168.122.1 + dns: 8.8.8.8 + mask: 24 + mgmt: + interface: 1 + network: 172.29.236.0 + mask: 22 + storage: + interface: 3 + network: 172.29.240.0 + mask: 24 + private: + interface: 2 + network: 172.29.242.0 + mask: 24 + public: + interface: 4 + network: 192.168.122.0 + mask: 24 + gateway: 192.168.122.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + osa: &idf_osa + nodes_roles: + opnfv: [deployment] + pod4-node1: [controller] + pod4-node2: [compute, storage] + pod4-node3: [compute, storage] + pod4-node4: [controller] + pod4-node5: [controller] + groups: + openstack: + - controller + - compute + - storage + hostnames: + opnfv: opnfv + pod4-node1: controller00 + pod4-node2: compute00 + pod4-node3: compute01 + pod4-node4: controller01 + pod4-node5: controller02 + network: + # 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 + deployment_host_interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'eno1' + - 'eno3.450' + osh: &idf_osh + nodes_roles: + opnvf: [opnfv] + pod4-node1: [kube-master, etcd, vault] + pod4-node2: [kube-node] + pod4-node3: [kube-node] + pod4-node4: [kube-master, etcd, vault] + pod4-node5: [kube-master, etcd, vault] + groups: + k8s-cluster: + - kube-node + - kube-master + hostnames: + opnfv: opnfv + pod4-node1: master1 + pod4-node2: node1 + pod4-node3: node2 + pod4-node4: master2 + pod4-node5: master3 + network: + # 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 + deployment_host_interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'eno1' + - 'eno3.450' + kubespray: &idf_kubespray + nodes_roles: + opnvf: [opnfv] + pod4-node1: [kube-master, etcd, vault] + pod4-node2: [kube-node] + pod4-node3: [kube-node] + pod4-node4: [kube-master, etcd, vault] + pod4-node5: [kube-master, etcd, vault] + groups: + k8s-cluster: + - kube-node + - kube-master + hostnames: + opnfv: opnfv + pod4-node1: master1 + pod4-node2: node1 + pod4-node3: node2 + pod4-node4: master2 + pod4-node5: master3 + network: + # 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 + deployment_host_interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'eno1' + - 'eno3.450' + fuel: + jumphost: + bridges: + admin: 'pxebr' + mgmt: 'br-ctl' + private: ~ + public: ~ + network: + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list, index should be in sync with interface index in PDF + - 'eno1' + - 'eno3' + - 'eno4' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:04:00.0' + - '0000:02:00.0' + - '0000:02:00.1' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr +xci: + pod_name: lf-pod4 + net_config: *net_config + nodes_roles: + opnfv_host: [opnfv_host] + pod4-node1: [compute, storage] + pod4-node2: [compute, storage] + pod4-node3: [controller, storage] + pod4-node4: [controller, storage] + pod4-node5: [controller, storage] + + # net_config network to be used by the PXE + pxe_network: admin + + # As the MAC of generated bridges are generated, we use a list of local + # bridges to create libvirt networks + jumphost_interfaces_bridges: + - name: br_admin + ip: + + extra_addresses: + opnfv_host: 192.168.12.2 + + flavors: + mini: + - opnfv + - pod4-node1 + - pod4-node2 + noha: + - opnfv + - pod4-node1 + - pod4-node2 + - pod4-node3 + ha: + - opnfv + - pod4-node1 + - pod4-node2 + - pod4-node3 + - pod4-node4 + - pod4-node5 + + installers: + osa: *idf_osa + kubespray: *idf_kubespray + osh: *idf_osh diff --git a/xci/var/lf-pod4-pdf.yml b/xci/var/lf-pod4-pdf.yml new file mode 100644 index 00000000..9607e4db --- /dev/null +++ b/xci/var/lf-pod4-pdf.yml @@ -0,0 +1,198 @@ +############################################################################## +# Copyright (c) 2018 Linux Foundation, 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 +############################################################################## +--- +### LF POD 4 descriptor file ### + +version: 1.0 +details: + pod_owner: Trevor Bramwell + contact: tbramwell@linuxfoundation.org + lab: Linux Foundation + location: Portland, Oregon, USA + type: development + link: https://wiki.opnfv.org/display/pharos/LF+POD+4 +jumphost: + name: pod4-jump + node: &nodeparams + type: baremetal + vendor: Intel Corporation + model: S2600WT2R + arch: x86_64 + cpus: 88 + cpu_cflags: haswell + cores: 22 + memory: 62G + disks: &disks + - name: 'disk1' + disk_capacity: 480G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + os: centos-7 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: admin + pass: octopus + remote_management: + <<: *remote_params + address: 172.30.8.83 + mac_address: "a4:bf:01:01:b0:bb" + interfaces: + - name: nic1 + speed: 1gb + features: 'dpdk|sriov' + vlan: native + mac_address: "a4:bf:01:01:b0:b9" + address: 192.168.12.1 + - name: nic2 + speed: 10gb + features: 'dpdk|sriov' + vlan: 450 + mac_address: "00:1e:67:fd:9a:04" + address: 192.168.0.2 + - name: nic3 + speed: 10gb + features: 'dpdk|sriov' + vlan: 452 + mac_address: "00:1e:67:fd:9a:04" + address: 192.168.2.2 + - name: nic4 + speed: 10gb + features: 'dpdk|sriov' + vlan: 451 + mac_address: "00:1e:67:fd:9a:05" + address: 192.168.1.2 + - name: nic5 + speed: 10gb + features: 'dpdk|sriov' + vlan: 414 + mac_address: "00:1e:67:fd:9a:05" + address: 172.30.12.83 +############################################################################## +nodes: + - name: pod4-node1 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.84 + mac_address: "a4:bf:01:01:ab:b6" + interfaces: + - mac_address: "a4:bf:01:01:ab:b4" + address: 192.168.122.3 + vlan: native + - mac_address: "00:1e:67:fd:9b:32" + address: 172.29.236.11 + vlan: 450 + - mac_address: "00:1e:67:fd:9b:32" + address: 192.168.122.3 + vlan: 452 + - mac_address: "00:1e:67:fd:9b:33" + address: 172.29.240.11 + vlan: 451 + - mac_address: "00:1e:67:fd:9b:33" + address: 172.29.242.11 + vlan: 414 + ############################################################################ + - name: pod4-node2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.85 + mac_address: "a4:bf:01:01:b6:97" + interfaces: + - mac_address: "a4:bf:01:01:b6:95" + address: 192.168.122.4 + vlan: native + - mac_address: "00:1e:67:fd:98:e2" + address: 172.29.236.12 + vlan: 450 + - mac_address: "00:1e:67:fd:98:e2" + address: 192.168.122.4 + vlan: 452 + - mac_address: "00:1e:67:fd:98:e3" + address: 172.29.240.12 + vlan: 451 + - mac_address: "00:1e:67:fd:98:e3" + address: 172.29.242.12 + vlan: 414 + ############################################################################ + - name: pod4-node3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.86 + mac_address: "a4:bf:01:01:66:fe" + interfaces: + - mac_address: "a4:bf:01:01:66:fc" + address: 192.168.122.5 + vlan: native + - mac_address: "00:1e:67:fd:9c:c8" + address: 172.29.236.13 + vlan: 450 + - mac_address: "00:1e:67:fd:9c:c8" + address: 192.168.122.5 + vlan: 452 + - mac_address: "00:1e:67:fd:9c:c9" + address: 172.29.240.13 + vlan: 451 + - mac_address: "00:1e:67:fd:9c:c9" + address: 172.29.242.13 + vlan: 414 + ############################################################################ + - name: pod4-node4 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.87 + mac_address: "a4:bf:01:01:b2:f5" + interfaces: + - mac_address: "a4:bf:01:01:b2:f3" + address: 192.168.122.6 + vlan: native + - mac_address: "00:1e:67:fd:9b:38" + address: 172.29.236.14 + vlan: 450 + - mac_address: "00:1e:67:fd:9b:38" + address: 192.168.122.6 + vlan: 452 + - mac_address: "00:1e:67:fd:9b:39" + address: 172.29.240.14 + vlan: 451 + - mac_address: "00:1e:67:fd:9b:39" + address: 172.29.242.14 + vlan: 414 + ############################################################################ + - name: pod4-node5 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.88 + mac_address: "a4:bf:01:01:b5:11" + interfaces: + - mac_address: "a4:bf:01:01:b5:0f" + address: 192.168.122.7 + vlan: native + - mac_address: "00:1e:67:fd:99:40" + address: 172.29.236.15 + vlan: 450 + - mac_address: "00:1e:67:fd:99:40" + address: 192.168.122.7 + vlan: 452 + - mac_address: "00:1e:67:fd:99:41" + address: 172.29.240.15 + vlan: 451 + - mac_address: "00:1e:67:fd:99:41" + address: 172.29.242.14 + vlan: 414 diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml index e7e3b76c..91b9ee38 100644 --- a/xci/var/opnfv.yml +++ b/xci/var/opnfv.yml @@ -28,8 +28,18 @@ openstack_osa_haproxy_git_url: "{{ lookup('env','OPENSTACK_OSA_HAPROXY_GIT_URL') # kubespray variables kubespray_git_url: "{{ lookup('env','KUBESPRAY_GIT_URL') }}" kubespray_version: "{{ lookup('env','KUBESPRAY_VERSION') }}" +kubernetes_version: "{{ lookup('env','KUBERNETES_VERSION') }}" xci_kube_ansible_pip_version: "{{ lookup('env','XCI_KUBE_ANSIBLE_PIP_VERSION') }}" +# openstack-helm variables +osh_git_url: "{{ lookup('env','OSH_GIT_URL') }}" +osh_version: "{{ lookup('env','OSH_VERSION') }}" +osh_infra_git_url: "{{ lookup('env','OSH_INFRA_GIT_URL') }}" +osh_infra_version: "{{ lookup('env','OSH_INFRA_VERSION') }}" +osh_helm_binary_url: "{{ lookup('env','OSH_HELM_BINARY_URL') }}" +osh_helm_binary_version: "{{ lookup('env','OSH_HELM_BINARY_VERSION') }}" +openstack_osh_version: "{{ lookup('env','OPENSTACK_OSH_VERSION') }}" + # variables for other components keepalived_git_url: "{{ lookup('env','KEEPALIVED_GIT_URL') }}" haproxy_version: "{{ lookup('env','HAPROXY_VERSION') }}" @@ -49,3 +59,7 @@ run_tempest: "{{ lookup('env', 'RUN_TEMPEST') }}" core_openstack_install: "{{ lookup('env', 'CORE_OPENSTACK_INSTALL') }}" deploy_scenario: "{{ lookup('env','DEPLOY_SCENARIO') }}" installer_type: "{{ lookup('env','INSTALLER_TYPE') }}" +osh_distro: "{{ lookup('env', 'OSH_DISTRO') }}" + +# baremetal variables +baremetal: "{{ lookup('env','BAREMETAL') }}" 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 |