From 558eff14252eee86f87f68561b1167fa9425502e Mon Sep 17 00:00:00 2001 From: Danil Golov Date: Fri, 28 Dec 2018 14:06:50 +0300 Subject: [PATCH] Use default subnet if another is not specified in NAD This commit adds check of 'subnetId' field in used net-attach-def. If 'subnetId' is not specified, default subnet will be used. Change-Id: I1055e0b9943d8bf21966e960654552b97720b60d Closes-Bug: 1810344 --- kuryr_kubernetes/controller/drivers/multi_vif.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kuryr_kubernetes/controller/drivers/multi_vif.py b/kuryr_kubernetes/controller/drivers/multi_vif.py index 4258607fe..ced25b707 100644 --- a/kuryr_kubernetes/controller/drivers/multi_vif.py +++ b/kuryr_kubernetes/controller/drivers/multi_vif.py @@ -16,6 +16,7 @@ from oslo_log import log as logging from oslo_serialization import jsonutils from kuryr_kubernetes import clients +from kuryr_kubernetes import config as kuryr_config from kuryr_kubernetes import constants from kuryr_kubernetes.controller.drivers import base from kuryr_kubernetes import exceptions @@ -64,7 +65,10 @@ class NPWGMultiVIFDriver(base.MultiVIFDriver): config = jsonutils.loads(nad_obj['metadata']['annotations'] ['openstack.org/kuryr-config']) - subnet_id = config[constants.K8S_ANNOTATION_NPWG_CRD_SUBNET_ID] + subnet_id = config.get( + constants.K8S_ANNOTATION_NPWG_CRD_SUBNET_ID, + kuryr_config.CONF.neutron_defaults.pod_subnet + ) subnet = {subnet_id: utils.get_subnet(subnet_id)} if constants.K8S_ANNOTATION_NPWG_CRD_DRIVER_TYPE not in config: vif_drv = self._drv_vif_pool