From: Thomas Goirand <zigo@debian.org>
Date: Mon, 1 Feb 2016 12:39:00 +0000 (+0800)
Subject: Fix setup of nova credentials.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=81ed9c3cdc92c847635cd07a315dc31aa729147c;p=openstack-build%2Fneutron-build.git

Fix setup of nova credentials.

Rewritten-From: 86c8299192b940bdbfde51c53956af3c5c51e4b5
---

diff --git a/xenial/debian/neutron-common.config.in b/xenial/debian/neutron-common.config.in
index c179765b7..fce8879c1 100644
--- a/xenial/debian/neutron-common.config.in
+++ b/xenial/debian/neutron-common.config.in
@@ -85,11 +85,11 @@ db_get neutron/plugin-select
 NEUTRON_PLUGIN_NAME=${RET}
 
 read_nova_admin_credentials () {
-	pkgos_read_config -p high ${N_CONF} DEFAULT nova_url neutron/nova_url
-	pkgos_read_config -p high ${N_CONF} DEFAULT nova_region_name neutron/nova_region
-	pkgos_read_config -p medium ${N_CONF} DEFAULT nova_admin_tenant_id neutron/nova_admin_tenant_id
-	pkgos_read_config -p medium ${N_CONF} DEFAULT nova_admin_username neutron/nova_admin_username
-	pkgos_read_config -p high ${N_CONF} DEFAULT nova_admin_password neutron/nova_admin_password
+	pkgos_read_config -p high ${N_CONF} nova url neutron/nova_url
+	pkgos_read_config -p high ${N_CONF} nova region_name neutron/nova_region
+	pkgos_read_config -p medium ${N_CONF} nova project_name neutron/nova_admin_tenant_name
+	pkgos_read_config -p medium ${N_CONF} nova username neutron/nova_admin_username
+	pkgos_read_config -p high ${N_CONF} nova password neutron/nova_admin_password
 }
 
 # OVS specific configurations (if that's the one selected)
diff --git a/xenial/debian/neutron-common.postinst.in b/xenial/debian/neutron-common.postinst.in
index 07bf75cbb..e65290df9 100644
--- a/xenial/debian/neutron-common.postinst.in
+++ b/xenial/debian/neutron-common.postinst.in
@@ -59,15 +59,21 @@ neutron_core_plugin_class () {
 
 write_nova_admin_credentials () {
         db_get neutron/nova_url
-	pkgos_inifile set ${N_CONF} DEFAULT nova_url ${RET}
+	pkgos_inifile set ${N_CONF} nova url ${RET}
+
 	db_get neutron/nova_region
-	pkgos_inifile set ${N_CONF} DEFAULT nova_region_name ${RET}
-	db_get neutron/nova_admin_tenant_id
-	pkgos_inifile set ${N_CONF} DEFAULT nova_admin_tenant_id ${RET}
+	pkgos_inifile set ${N_CONF} nova region_name ${RET}
+
+	db_get neutron/nova_admin_tenant_name
+	NOVA_TENANT_NAME_IN_NEUTRON=${RET}
+	pkgos_inifile set ${N_CONF} nova tenant_name ${RET}
+	pkgos_inifile set ${N_CONF} nova project_name ${RET}
+
 	db_get neutron/nova_admin_username
-	pkgos_inifile set ${N_CONF} DEFAULT nova_admin_username ${RET}
+	pkgos_inifile set ${N_CONF} nova username ${RET}
+
 	db_get neutron/nova_admin_password
-	pkgos_inifile set ${N_CONF} DEFAULT nova_admin_password ${RET}
+	pkgos_inifile set ${N_CONF} nova password ${RET}
 }
 
 if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
diff --git a/xenial/debian/neutron-common.templates b/xenial/debian/neutron-common.templates
index bda27e084..3b0910bc8 100644
--- a/xenial/debian/neutron-common.templates
+++ b/xenial/debian/neutron-common.templates
@@ -139,12 +139,12 @@ Default: regionOne
 _Description: Nova server region name:
  Please enter the region of the Nova server.
 
-Template: neutron/nova_admin_tenant_id
+Template: neutron/nova_admin_tenant_name
 Type: string
 Default: admin
-_Description: Nova admin tenant ID:
+_Description: Nova admin tenant name:
  Neutron needs to be able to communicate with Nova through Keystone. Therefore
- Neutron needs to know the Nova admin tenant ID, username and password.
+ Neutron needs to know the Nova admin tenant name, username and password.
  .
  Please enter the ID of the admin tenant for Nova.