Skip to content

Commit

Permalink
For sriov update the nova.conf with scheduler_default_filters
Browse files Browse the repository at this point in the history
during upgrade .

Change-Id: Ifc562c014f1e3713ce72fb8ffc7c51ae127a7b30
Closes-Bug:#1627203
  • Loading branch information
krharsh committed Mar 31, 2017
1 parent 096b220 commit a9a2b08
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions contrail_provisioning/openstack/upgrade.py
Expand Up @@ -115,6 +115,15 @@ def fix_nova_config_kv3_params(self):
local("openstack-config --set /etc/nova/nova.conf neutron project_domain_name Default")
local("openstack-config --set /etc/nova/nova.conf neutron user_domain_name Default")

def fix_sriov_nova_config(self):
with settings(warn_only=True):
nova_conf_file = '/etc/nova/nova.conf'
if (self._args.from_rel >= LooseVersion('3.00')):
default_filter= ('RetryFilter, AvailabilityZoneFilter, RamFilter, DiskFilter, '
'ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter, '
'ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter, PciPassthroughFilter')
local("openstack-config --set %s DEFAULT scheduler_default_filters '%s'" % (nova_conf_file, default_filter))

def upgrade(self):
self.stop()
self._upgrade()
Expand All @@ -135,6 +144,8 @@ def upgrade(self):
if ('v3' in self._args.keystone_version and
self._args.from_rel <= LooseVersion('3.1.2.0')):
self.fix_nova_config_kv3_params()
if (self._args.sriov):
self.fix_sriov_nova_config()
self.restart()


Expand Down

0 comments on commit a9a2b08

Please sign in to comment.