diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-09-16 15:22:23 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-09-16 22:55:21 -0400 |
| commit | d926dfba758be9db6bed30df8bd334c73408cdf8 (patch) | |
| tree | e7b72fa00fed958188bde5607ef5222739c41412 /meta-openstack/recipes-devtools/python/python-nova | |
| parent | 7c6d9411f8b95df95dcf6504f0bdcc6f4d08edd5 (diff) | |
| download | meta-cloud-services-d926dfba758be9db6bed30df8bd334c73408cdf8.tar.gz | |
core: update core projects to juno b3 release
Along with this update, we also fix a bug with nova and neutron port types.
this patch will be removed once it is fixed in the upstream project.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova/neutron-api-set-default-binding-vnic_type.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/neutron-api-set-default-binding-vnic_type.patch b/meta-openstack/recipes-devtools/python/python-nova/neutron-api-set-default-binding-vnic_type.patch new file mode 100644 index 0000000..5f2e950 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-nova/neutron-api-set-default-binding-vnic_type.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | From 5f7ffa7f9eb0e35b8a18a6f0bf680149af174232 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 3 | Date: Tue, 16 Sep 2014 15:14:15 -0400 | ||
| 4 | Subject: [PATCH] neutron/api: set default binding:vnic_type | ||
| 5 | |||
| 6 | Fix the following issue: https://bugs.launchpad.net/neutron/+bug/1370077, | ||
| 7 | by ensuring that if the backend driver doesn't set vnic_type, that the | ||
| 8 | default of VNIC_TYPE_NORMAL is used. | ||
| 9 | |||
| 10 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 11 | --- | ||
| 12 | nova/network/neutronv2/api.py | 3 +++ | ||
| 13 | 1 file changed, 3 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py | ||
| 16 | index 124640e1a275..67811788e1a4 100644 | ||
| 17 | --- a/nova/network/neutronv2/api.py | ||
| 18 | +++ b/nova/network/neutronv2/api.py | ||
| 19 | @@ -1361,6 +1361,9 @@ class API(base_api.NetworkAPI): | ||
| 20 | or current_neutron_port['status'] == 'ACTIVE'): | ||
| 21 | vif_active = True | ||
| 22 | |||
| 23 | + if not 'binding:vnic_type' in current_neutron_port: | ||
| 24 | + current_neutron_port['binding:vnic_type'] = network_model.VNIC_TYPE_NORMAL | ||
| 25 | + | ||
| 26 | network_IPs = self._nw_info_get_ips(client, | ||
| 27 | current_neutron_port) | ||
| 28 | subnets = self._nw_info_get_subnets(context, | ||
| 29 | -- | ||
| 30 | 1.9.1 | ||
| 31 | |||
