df1c999e41
Depends-On: I8f30fbdf94d76ef9fa2985a25c033df290995326 Change-Id: I35b3793a660cfc27faf700b9679529b154e41df4
151 lines
8.8 KiB
Bash
Executable File
151 lines
8.8 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
#NOTE(portdirect): This file is included as an example of how to deploy
|
|
# nova and neutron with ovs and sr-iov active. It will not work without
|
|
# modification for your environment.
|
|
|
|
set -xe
|
|
|
|
#NOTE: Pull images and lint chart
|
|
make pull-images nova
|
|
make pull-images neutron
|
|
|
|
SRIOV_DEV1=enp3s0f0
|
|
SRIOV_DEV2=enp66s0f1
|
|
OVSBR=vlan92
|
|
|
|
#NOTE: Deploy nova
|
|
: ${OSH_EXTRA_HELM_ARGS:=""}
|
|
tee /tmp/nova.yaml << EOF
|
|
network:
|
|
backend:
|
|
- openvswitch
|
|
- sriov
|
|
conf:
|
|
nova:
|
|
DEFAULT:
|
|
debug: True
|
|
vcpu_pin_set: 4,8,12,16,20,24,28,32,36,40,44,48,52,56,60,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61
|
|
vif_plugging_is_fatal: False
|
|
vif_plugging_timeout: 30
|
|
pci:
|
|
alias: '{"name": "numa0", "capability_type": "pci", "product_id": "10fb", "vendor_id": "8086", "device_type": "type-PCI", "numa_policy": "required"}'
|
|
passthrough_whitelist: |
|
|
[{"address": "0000:03:10.0", "physical_network": "physnet1"}, {"address": "0000:03:10.2", "physical_network": "physnet1"}, {"address": "0000:03:10.4", "physical_network": "physnet1"}, {"address": "0000:03:10.6", "physical_network": "physnet1"}, {"address": "0000:03:11.0", "physical_network": "physnet1"}, {"address": "0000:03:11.2", "physical_network": "physnet1"}, {"address": "0000:03:11.4", "physical_network": "physnet1"}, {"address": "0000:03:11.6", "physical_network": "physnet1"}, {"address": "0000:03:12.0", "physical_network": "physnet1"}, {"address": "0000:03:12.2", "physical_network": "physnet1"}, {"address": "0000:03:12.4", "physical_network": "physnet1"}, {"address": "0000:03:12.6", "physical_network": "physnet1"}, {"address": "0000:03:13.0", "physical_network": "physnet1"}, {"address": "0000:03:13.2", "physical_network": "physnet1"}, {"address": "0000:03:13.4", "physical_network": "physnet1"}, {"address": "0000:03:13.6", "physical_network": "physnet1"}, {"address": "0000:03:14.0", "physical_network": "physnet1"}, {"address": "0000:03:14.2", "physical_network": "physnet1"}, {"address": "0000:03:14.4", "physical_network": "physnet1"}, {"address": "0000:03:14.6", "physical_network": "physnet1"}, {"address": "0000:03:15.0", "physical_network": "physnet1"}, {"address": "0000:03:15.2", "physical_network": "physnet1"}, {"address": "0000:03:15.4", "physical_network": "physnet1"}, {"address": "0000:03:15.6", "physical_network": "physnet1"}, {"address": "0000:03:16.0", "physical_network": "physnet1"}, {"address": "0000:03:16.2", "physical_network": "physnet1"}, {"address": "0000:03:16.4", "physical_network": "physnet1"}, {"address": "0000:03:16.6", "physical_network": "physnet1"}, {"address": "0000:03:17.0", "physical_network": "physnet1"}, {"address": "0000:03:17.2", "physical_network": "physnet1"}, {"address": "0000:03:17.4", "physical_network": "physnet1"}, {"address": "0000:03:17.6", "physical_network": "physnet1"}, {"address": "0000:42:10.1", "physical_network": "physnet2"}, {"address": "0000:42:10.3", "physical_network": "physnet2"}, {"address": "0000:42:10.5", "physical_network": "physnet2"}, {"address": "0000:42:10.7", "physical_network": "physnet2"}, {"address": "0000:42:11.1", "physical_network": "physnet2"}, {"address": "0000:42:11.3", "physical_network": "physnet2"}, {"address": "0000:42:11.5", "physical_network": "physnet2"}, {"address": "0000:42:11.7", "physical_network": "physnet2"}, {"address": "0000:42:12.1", "physical_network": "physnet2"}, {"address": "0000:42:12.3", "physical_network": "physnet2"}, {"address": "0000:42:12.5", "physical_network": "physnet2"}, {"address": "0000:42:12.7", "physical_network": "physnet2"}, {"address": "0000:42:13.1", "physical_network": "physnet2"}, {"address": "0000:42:13.3", "physical_network": "physnet2"}, {"address": "0000:42:13.5", "physical_network": "physnet2"}, {"address": "0000:42:13.7", "physical_network": "physnet2"}, {"address": "0000:42:14.1", "physical_network": "physnet2"}, {"address": "0000:42:14.3", "physical_network": "physnet2"}, {"address": "0000:42:14.5", "physical_network": "physnet2"}, {"address": "0000:42:14.7", "physical_network": "physnet2"}, {"address": "0000:42:15.1", "physical_network": "physnet2"}, {"address": "0000:42:15.3", "physical_network": "physnet2"}, {"address": "0000:42:15.5", "physical_network": "physnet2"}, {"address": "0000:42:15.7", "physical_network": "physnet2"}, {"address": "0000:42:16.1", "physical_network": "physnet2"}, {"address": "0000:42:16.3", "physical_network": "physnet2"}, {"address": "0000:42:16.5", "physical_network": "physnet2"}, {"address": "0000:42:16.7", "physical_network": "physnet2"}, {"address": "0000:42:17.1", "physical_network": "physnet2"}, {"address": "0000:42:17.3", "physical_network": "physnet2"}, {"address": "0000:42:17.5", "physical_network": "physnet2"}, {"address": "0000:42:17.7", "physical_network": "physnet2"}]
|
|
filter_scheduler:
|
|
enabled_filters: "RetryFilter, AvailabilityZoneFilter, RamFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter, ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter, PciPassthroughFilter, NUMATopologyFilter, DifferentHostFilter, SameHostFilter"
|
|
EOF
|
|
|
|
if [ "x$(systemd-detect-virt)" == "xnone" ]; then
|
|
echo 'OSH is not being deployed in virtualized environment'
|
|
helm upgrade --install nova ./nova \
|
|
--namespace=openstack \
|
|
--values /tmp/nova.yaml \
|
|
${OSH_EXTRA_HELM_ARGS}
|
|
else
|
|
echo 'OSH is being deployed in virtualized environment, using qemu for nova'
|
|
helm upgrade --install nova ./nova \
|
|
--namespace=openstack \
|
|
--set conf.nova.libvirt.virt_type=qemu \
|
|
--set conf.nova.libvirt.cpu_mode=none \
|
|
--values /tmp/nova.yaml \
|
|
${OSH_EXTRA_HELM_ARGS}
|
|
fi
|
|
|
|
#NOTE: Deploy neutron
|
|
tee /tmp/neutron.yaml << EOF
|
|
network:
|
|
backend:
|
|
- openvswitch
|
|
- sriov
|
|
interface:
|
|
tunnel: docker0
|
|
sriov:
|
|
- device: ${SRIOV_DEV1}
|
|
num_vfs: 32
|
|
promisc: false
|
|
- device: ${SRIOV_DEV2}
|
|
num_vfs: 32
|
|
promisc: false
|
|
auto_bridge_add:
|
|
br-ex: null
|
|
br-physnet3: ${OVSBR}
|
|
conf:
|
|
neutron:
|
|
DEFAULT:
|
|
debug: True
|
|
l3_ha: False
|
|
max_l3_agents_per_router: 1
|
|
l3_ha_network_type: vxlan
|
|
dhcp_agents_per_network: 1
|
|
plugins:
|
|
ml2_conf:
|
|
ml2:
|
|
mechanism_drivers: openvswitch,sriovnicswitch,l2population
|
|
ml2_type_flat:
|
|
flat_networks: public
|
|
type_drivers: vlan,flat,vxlan
|
|
mechanism_drivers: openvswitch,sriovnicswitch,l2population
|
|
tenant_network_types: vxlan
|
|
ml2_type_vlan:
|
|
network_vlan_ranges: physnet1:20:30,physnet2:20:30
|
|
#NOTE(portdirect): for clarity we include options for all the neutron
|
|
# backends here.
|
|
openvswitch_agent:
|
|
agent:
|
|
tunnel_types: vxlan
|
|
ovs:
|
|
bridge_mappings: "public:br-ex,physnet3:br-physnet3"
|
|
linuxbridge_agent:
|
|
linux_bridge:
|
|
bridge_mappings: "public:br-ex,physnet1:br-physnet1"
|
|
sriov_agent:
|
|
sriov_nic:
|
|
physical_device_mappings: physnet1:${SRIOV_DEV1},physnet2:${SRIOV_DEV2}
|
|
exclude_devices: null
|
|
EOF
|
|
kubectl label node cab24-r820-14 --overwrite=true sriov=enabled
|
|
kubectl label node cab24-r820-15 --overwrite=true sriov=enabled
|
|
|
|
helm upgrade --install neutron ./neutron \
|
|
--namespace=openstack \
|
|
--values=/tmp/neutron.yaml \
|
|
${OSH_EXTRA_HELM_ARGS}
|
|
|
|
#NOTE: Wait for deploy
|
|
helm osh wait-for-pods openstack
|
|
|
|
#NOTE: Validate Deployment info
|
|
export OS_CLOUD=openstack_helm
|
|
openstack service list
|
|
sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
|
|
openstack compute service list
|
|
openstack network agent list
|
|
|
|
#NOTE: Exercise the deployment
|
|
openstack network create test
|
|
NET_ID=$(openstack network show test -f value -c id)
|
|
openstack subnet create --subnet-range "172.24.4.0/24" --network ${NET_ID} test
|
|
openstack port create --network ${NET_ID} --fixed-ip subnet=test,ip-address="172.24.4.10" --binding-profile vnic_type=direct sriov_port
|
|
PORT_ID=$(openstack port show sriov_port -f value -c id)
|
|
|
|
# NOTE(portdirect): We do this fancy, and seemingly pointless, footwork to get
|
|
# the full image name for the cirros Image without having to be explicit.
|
|
export IMAGE_NAME=$(openstack image show -f value -c name \
|
|
$(openstack image list -f csv | awk -F ',' '{ print $2 "," $1 }' | \
|
|
grep "^\"Cirros" | head -1 | awk -F ',' '{ print $2 }' | tr -d '"'))
|
|
|
|
openstack server create --flavor m1.tiny --image "${IMAGE_NAME}" --nic port-id=${PORT_ID} test-sriov
|