diff --git a/contrail_provisioning/openstack/upgrade.py b/contrail_provisioning/openstack/upgrade.py index 0c24f500..8a49f65e 100644 --- a/contrail_provisioning/openstack/upgrade.py +++ b/contrail_provisioning/openstack/upgrade.py @@ -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() @@ -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()