From: Thomas Goirand Date: Mon, 1 Feb 2016 11:53:54 +0000 (+0000) Subject: Fix v3 auth for the [nova] section X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=02535c1541d31ccfe6beb871f7e9fdd169dc0cdf;p=openstack-build%2Fneutron-build.git Fix v3 auth for the [nova] section Rewritten-From: fcef68a4db34ee323180b372be9913aeb9755123 --- diff --git a/xenial/debian/rules b/xenial/debian/rules index 8a8ce1d39..551f5b47f 100755 --- a/xenial/debian/rules +++ b/xenial/debian/rules @@ -120,6 +120,17 @@ override_dh_install: sed -i 's/^[ \t#]*auth_protocol[ \t]*=[ \t].*/auth_protocol = http/' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf oslo_concurrency lock_path /var/lock/neutron + # Fix v3 auth for the [nova] section + pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova user_domain_id default + pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova project_name admin + pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova auth_plugin v3password + pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova auth_url http://127.0.0.1:5000/v3 + pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova tenant_name admin + pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova username admin + pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova user_domain_name default + pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova project_domain_name default + + # openvswitch_agent.ini mkdir -p $(CURDIR)/debian/neutron-common/usr/share/neutron-common PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini \