openstack/fuel-octane
Code Issues Proposed changes

Use only Fuel release version to determine default port provider

Browse Source 
Only Fuel release version defines the default port provider. Exclude
OpenStack release version from the comparison. Use StrictVersion instead
of LooseVersion.

Change-Id: I9927c006d6842fc3cca7f5bd068402eb70acea4e
Closes-bug: 1536182
(cherry picked from commit f6616e07ed952167ce11d33d47c5349bd4cd8542)
This commit is contained in:
Oleg Gelbukh 2016-01-20 14:00:55 +00:00
parent c715defc4c
commit 008152464b
1 changed files with 4 additions and 3 deletions

7
octane/helpers/transformations.py

@ -15,7 +15,7 @@ import os
import re
import yaml
from distutils.version import LooseVersion
from distutils.version import StrictVersion
from octane import magic_consts
@ -147,8 +147,9 @@ def get_admin_iface(actions):
def get_patch_port_action(host_config, bridge):
actions = get_actions(host_config)
version = LooseVersion(host_config.get('openstack_version'))
if version < LooseVersion('2014.2.2-6.1'):
version = host_config.get('openstack_version')
_, _, fuel_version = version.rpartition('-')
if StrictVersion(fuel_version) < StrictVersion('6.1'):
provider = 'ovs'
else:
provider = get_bridge_provider(actions, bridge)