From 9633b5b70f9e9324b3e3d25b3ee08091c9062ab8 Mon Sep 17 00:00:00 2001 From: Deepinder Setia Date: Thu, 16 Feb 2017 17:18:57 -0800 Subject: [PATCH] user_domain_name and project_domain_name parameters need to be added to neutron section of nova.conf if keystone v3 is enabled. This happens in 3.2+ during provisioning but was missing in 3.1 Change-Id: Ib442785932d437a477761bb5b50879a4f6a30192 Closes-Bug: #1649999 --- contrail_provisioning/compute/upgrade.py | 8 ++++++++ contrail_provisioning/openstack/upgrade.py | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/contrail_provisioning/compute/upgrade.py b/contrail_provisioning/compute/upgrade.py index af016534..59e77e35 100644 --- a/contrail_provisioning/compute/upgrade.py +++ b/contrail_provisioning/compute/upgrade.py @@ -83,6 +83,10 @@ def fix_nova_params(self): nova_conf_file) local("service %s start" % openstack_compute_service) + 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 upgrade(self): self.disable_apt_get_auto_start() self._upgrade() @@ -98,6 +102,10 @@ def upgrade(self): if (self._args.from_rel < LooseVersion('2.20') and self._args.to_rel >= LooseVersion('2.20')): self.compute_setup.fixup_contrail_vrouter_nodemgr() + # In 3.2+, nova.conf [neutron] extra parameters are created for v3 + if ('v3' in self._args.keystone_version and + self._args.from_rel <= LooseVersion('3.1.2.0')): + self.fix_nova_config_kv3_params() self.enable_apt_get_auto_start() def main(): diff --git a/contrail_provisioning/openstack/upgrade.py b/contrail_provisioning/openstack/upgrade.py index d2266b04..0c24f500 100644 --- a/contrail_provisioning/openstack/upgrade.py +++ b/contrail_provisioning/openstack/upgrade.py @@ -111,6 +111,10 @@ def fix_haproxy_config(self): local("sed -i -e 's/timeout client 24h/timeout client 0/g' %s" % hap_cfg) local("sed -i -e 's/timeout server 24h/timeout server 0/g' %s" % hap_cfg) + 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 upgrade(self): self.stop() self._upgrade() @@ -127,6 +131,10 @@ def upgrade(self): self.fix_cmon_config() self.fix_cmon_param_file() self.fix_haproxy_config() + # In 3.2+, nova.conf [neutron] extra parameters are created for v3 + if ('v3' in self._args.keystone_version and + self._args.from_rel <= LooseVersion('3.1.2.0')): + self.fix_nova_config_kv3_params() self.restart()