Add NPWG Multi-VIF driver option in devstack
In devstack plugin, add KURYR_MULTI_VIF_DRIVER parameter to specify which multi-vif driver to be enabled. If it's NPWG driver, the network attachemnt definition CRD is created in Kubernetes cluster. Change-Id: I260a44880b9cfb3686843504bd29649e5d0518d0
This commit is contained in:
parent
5fa529efa4
commit
babc761aed
@ -241,6 +241,11 @@ enable_service kuryr-daemon
|
||||
# configured with the nested driver
|
||||
# KURYR_VIF_POOL_MANAGER=True
|
||||
|
||||
# Kuryr Multi-VIF Driver
|
||||
# Uncomment the next line to enable the npwg multi-vif driver.
|
||||
# Default value: noop
|
||||
# KURYR_MULTI_VIF_DRIVER=npwg_multiple_interfaces
|
||||
|
||||
# Increase Octavia amphorae timeout so that the first LB amphora has time to
|
||||
# build and boot
|
||||
if [[ "$KURYR_K8S_LBAAS_USE_OCTAVIA" == "True" ]]; then
|
||||
|
@ -62,6 +62,9 @@ function configure_kuryr {
|
||||
iniset "$KURYR_CONFIG" kubernetes ssl_ca_crt_file "$KURYR_K8S_API_CACERT"
|
||||
iniset "$KURYR_CONFIG" kubernetes ssl_verify_server_crt True
|
||||
fi
|
||||
if [ "$KURYR_MULTI_VIF_DRIVER" ]; then
|
||||
iniset "$KURYR_CONFIG" kubernetes multi_vif_drivers "$KURYR_MULTI_VIF_DRIVER"
|
||||
fi
|
||||
# REVISIT(ivc): 'use_stderr' is required for current CNI driver. Once a
|
||||
# daemon-based CNI driver is implemented, this could be removed.
|
||||
iniset "$KURYR_CONFIG" DEFAULT use_stderr true
|
||||
@ -893,7 +896,9 @@ if [[ "$1" == "stack" && "$2" == "extra" ]]; then
|
||||
generate_containerized_kuryr_resources False
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$KURYR_MULTI_VIF_DRIVER" == "npwg_multiple_interfaces" ]; then
|
||||
/usr/local/bin/kubectl apply -f ${KURYR_HOME}/kubernetes_crds/network_attachment_definition_crd.yaml
|
||||
fi
|
||||
fi
|
||||
|
||||
elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
|
||||
@ -942,6 +947,9 @@ elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
|
||||
if is_service_enabled tempest && [[ "$KURYR_K8S_SERIAL_TESTS" == "True" ]]; then
|
||||
iniset $TEMPEST_CONFIG kuryr_kubernetes run_tests_serial True
|
||||
fi
|
||||
if is_service_enabled tempest && [[ "$KURYR_MULTI_VIF_DRIVER" == "npwg_multiple_interfaces" ]]; then
|
||||
iniset $TEMPEST_CONFIG kuryr_kubernetes npwg_multi_vif_enabled True
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ "$1" == "unstack" ]]; then
|
||||
|
@ -27,17 +27,17 @@ followed:
|
||||
version: v1
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: network-attachment-definitions
|
||||
singular: network-attachment-definition
|
||||
kind: NetworkAttachmentDefinition
|
||||
shortNames:
|
||||
- net-attach-def
|
||||
plural: network-attachment-definitions
|
||||
singular: network-attachment-definition
|
||||
kind: NetworkAttachmentDefinition
|
||||
shortNames:
|
||||
- net-attach-def
|
||||
validation:
|
||||
openAPIV3Schema:
|
||||
openAPIV3Schema:
|
||||
properties:
|
||||
spec:
|
||||
spec:
|
||||
properties:
|
||||
config:
|
||||
config:
|
||||
type: string
|
||||
EOF
|
||||
$ kubectl apply -f nad.yal
|
||||
|
21
kubernetes_crds/network_attachment_definition_crd.yaml
Normal file
21
kubernetes_crds/network_attachment_definition_crd.yaml
Normal file
@ -0,0 +1,21 @@
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: network-attachment-definitions.k8s.cni.cncf.io
|
||||
spec:
|
||||
group: k8s.cni.cncf.io
|
||||
version: v1
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: network-attachment-definitions
|
||||
singular: network-attachment-definition
|
||||
kind: NetworkAttachmentDefinition
|
||||
shortNames:
|
||||
- net-attach-def
|
||||
validation:
|
||||
openAPIV3Schema:
|
||||
properties:
|
||||
spec:
|
||||
properties:
|
||||
config:
|
||||
type: string
|
Loading…
x
Reference in New Issue
Block a user