From 916683fa5c90220db11ed36877bfb1b50b523ba2 Mon Sep 17 00:00:00 2001 From: "Sridhar K. N. Rao" Date: Sat, 9 Nov 2019 09:14:33 +0530 Subject: Site: Intel Pod-10 Cleanup and Enable SRIOV This patch performs some cleanup and enable SRIOV for pod10. pod10prep.sh script is removed. Added environment file intel-pod10.env, which could be used by deploy.sh Signed-off-by: Sridhar K. N. Rao Change-Id: I4c9759edf69511a426315a227012b5fbe9dea498 --- site/intel-pod10/intel-pod10.env | 9 +++ .../intel-pod10/profiles/hardware/intel-pod10.yaml | 58 +++++++------- .../charts/osh/openstack-compute-kit/neutron.yaml | 88 +++++++++++----------- tools/pod10prep.sh | 7 -- 4 files changed, 80 insertions(+), 82 deletions(-) create mode 100644 site/intel-pod10/intel-pod10.env delete mode 100755 tools/pod10prep.sh diff --git a/site/intel-pod10/intel-pod10.env b/site/intel-pod10/intel-pod10.env new file mode 100644 index 0000000..3f8755d --- /dev/null +++ b/site/intel-pod10/intel-pod10.env @@ -0,0 +1,9 @@ +export OS_AUTH_URL=${OS_AUTH_URL:-http://iam-airship.intel-pod10.opnfv.org:80/v3} +export GEN_SSH=${GEN_SSH:-intel-pod10-genesis} +export SITE_NAME=${SITE_NAME:-intel-pod10} + +export GEN_IPMI=${GEN_IPMI:-10.10.100.11} +export NODES_IPMI=${NODES_IPMI:-'10.10.100.12 10.10.100.13 10.10.100.14 10.10.100.15'} +export SITE_DEF=${SITE_DEF:-airship/site/intel-pod10/site-definition.yaml} + +export OS_AUTH_URL_IDENTITY=${OS_AUTH_URL:-http://identity-airship.intel-pod10.opnfv.org:80/v3} diff --git a/site/intel-pod10/profiles/hardware/intel-pod10.yaml b/site/intel-pod10/profiles/hardware/intel-pod10.yaml index 9d1764d..131ba73 100644 --- a/site/intel-pod10/profiles/hardware/intel-pod10.yaml +++ b/site/intel-pod10/profiles/hardware/intel-pod10.yaml @@ -29,13 +29,10 @@ data: device_aliases: ## network # $ sudo lspci |grep -i ethernet - # 03:00.0 Ethernet controller: Intel Corporation I350 Gigabit Network Connection (rev 01) - # 03:00.3 Ethernet controller: Intel Corporation I350 Gigabit Network Connection (rev 01) - # 05:00.0 Ethernet controller: Intel Corporation Ethernet Controller X710 for 10GbE SFP+ (rev 01) - # 05:00.1 Ethernet controller: Intel Corporation Ethernet Controller X710 for 10GbE SFP+ (rev 01) - # 05:00.2 Ethernet controller: Intel Corporation Ethernet Controller X710 for 10GbE SFP+ (rev 01) - # 05:00.3 Ethernet controller: Intel Corporation Ethernet Controller X710 for 10GbE SFP+ (rev 01) - + # 02:00.0 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01) + # 02:00.1 Ethernet controller: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ Network Connection (rev 01) + # 04:00.0 Ethernet controller: Intel Corporation I350 Gigabit Network Connection (rev 01) + # 04:00.3 Ethernet controller: Intel Corporation I350 Gigabit Network Connection (rev 01) # control networks # eno1 ctrl_nic1: @@ -62,30 +59,29 @@ data: ## storage # $ sudo lshw -c disk - # *-disk - # description: ATA Disk - # product: INTEL SSDSC2BB48 - # physical id: 0.0.0 - # bus info: scsi@4:0.0.0 - # logical name: /dev/sda - # version: 0101 - # serial: PHDV637602LL480BGN - # size: 447GiB (480GB) - # capabilities: gpt-1.00 partitioned partitioned:gpt - # configuration: ansiversion=5 guid=ea7d0b6a-c105-4409-8d4c-dc104cb38737 logicalsectorsize=512 sectorsize=4096 - # *-disk - # description: ATA Disk - # product: ST91000640NS - # vendor: Seagate - # physical id: 0.0.0 - # bus info: scsi@5:0.0.0 - # logical name: /dev/sdb - # version: SN03 - # serial: 9XG6LX48 - # size: 931GiB (1TB) - # capabilities: gpt-1.00 partitioned partitioned:gpt - # configuration: ansiversion=5 guid=27f17348-e081-4b00-8d4c-5960513a40cd logicalsectorsize=512 sectorsize=512 - + # *-disk + # description: ATA Disk + # product: ST3000NM0033-9ZM + # vendor: Seagate + # physical id: 0.0.0 + # bus info: scsi@0:0.0.0 + # logical name: /dev/sda + # version: SN04 + # serial: S1Z1NT3V + # size: 2794GiB (3TB) + # capabilities: gpt-1.00 partitioned partitioned:gpt + # configuration: ansiversion=5 guid=911eca8f-824e-4dc4-bcce-9005cc9a24d7 logicalsectorsize=512 sectorsize=512 + # *-disk + # description: ATA Disk + # product: INTEL SSDSC2BW18 + # physical id: 0.0.0 + # bus info: scsi@1:0.0.0 + # logical name: /dev/sdb + # version: RG20 + # serial: CVTR517302RG180BGN + # size: 167GiB (180GB) + # capabilities: gpt-1.00 partitioned partitioned:gpt + # configuration: ansiversion=5 guid=a4963ed8-81e6-415f-a3cf-4254da4fb3ca logicalsectorsize=512 sectorsize=512 # /dev/sda bootdisk: address: '0:0.0.0' diff --git a/site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml b/site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml index 38e3cd3..f19ee86 100644 --- a/site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml +++ b/site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml @@ -25,48 +25,48 @@ data: timeout: 1800 test: timeout: 900 - # values: - # labels: - # sriov: - # node_selector_key: sriov - # node_selector_value: enabled - # pod: - # security_context: - # neutron_sriov_agent: - # pod: - # runAsUser: 42424 - # container: - # neutron_sriov_agent_init: - # privileged: true - # runAsUser: 0 - # readOnlyRootFilesystem: false - # neutron_sriov_agent: - # readOnlyRootFilesystem: true - # privileged: true - # network: - # interface: - # sriov: - # - device: eno4 - # num_vfs: 32 - # promisc: false - # backend: - # - openvswitch - # - sriov - # conf: - # plugins: - # ml2_conf: - # ml2: - # mechanism_drivers: l2population,openvswitch,sriovnicswitch - # ml2_type_vlan: - # ## NOTE: Must have at least 1 sriov network defined - # network_vlan_ranges: external,sriovnet1:100:4000 - # sriov_agent: - # securitygroup: - # firewall_driver: neutron.agent.firewall.NoopFirewallDriver - # sriov_nic: - # ## NOTE: Must have at least 1 sriov network to physical device - # ## mapping, otherwise sriov agent readiness check - # ## will fail. - # physical_device_mappings: sriovnet1:eno4 - # exclude_devices: "" + values: + labels: + sriov: + node_selector_key: sriov + node_selector_value: enabled + pod: + security_context: + neutron_sriov_agent: + pod: + runAsUser: 42424 + container: + neutron_sriov_agent_init: + privileged: true + runAsUser: 0 + readOnlyRootFilesystem: false + neutron_sriov_agent: + readOnlyRootFilesystem: true + privileged: true + network: + interface: + sriov: + - device: eno4 + num_vfs: 32 + promisc: false + backend: + - openvswitch + - sriov + conf: + plugins: + ml2_conf: + ml2: + mechanism_drivers: l2population,openvswitch,sriovnicswitch + ml2_type_vlan: + ## NOTE: Must have at least 1 sriov network defined + network_vlan_ranges: external,sriovnet1:100:4000 + sriov_agent: + securitygroup: + firewall_driver: neutron.agent.firewall.NoopFirewallDriver + sriov_nic: + ## NOTE: Must have at least 1 sriov network to physical device + ## mapping, otherwise sriov agent readiness check + ## will fail. + physical_device_mappings: sriovnet1:eno4 + exclude_devices: "" ... diff --git a/tools/pod10prep.sh b/tools/pod10prep.sh deleted file mode 100755 index 69982ce..0000000 --- a/tools/pod10prep.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -x - -sed -i 's/ens785f1/eno4/g' ../type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml - -cp files/heat-public-net-deployment-pod10.yaml files/heat-public-net-deployment.yaml -- cgit 1.2.3-korg