commit d84b874ef6fff88b93e9b0eab79dea6e6868f94f
author Zuul <zuul@review.opendev.org> Tue Jul 23 16:50:12 2024 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jul 23 16:50:12 2024 +0000
tree 7c79f6f7fd8fc19d3612126dcd84e64670e31a80
parent 640899124f88ec8d7e7c9c39929c6a562e847749
parent 696dbdf045cbf1c1525bb25c005ce767d1c9e9b8

Merge "Make nova only use the nova account"

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 3d40472..2325188 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -496,7 +496,7 @@
     local conf=${1:-$NOVA_CONF}
     iniset $conf neutron auth_type "password"
     iniset $conf neutron auth_url "$KEYSTONE_SERVICE_URI"
-    iniset $conf neutron username "$Q_ADMIN_USERNAME"
+    iniset $conf neutron username nova
     iniset $conf neutron password "$SERVICE_PASSWORD"
     iniset $conf neutron user_domain_name "$SERVICE_DOMAIN_NAME"
     iniset $conf neutron project_name "$SERVICE_PROJECT_NAME"

lib/nova

diff --git a/lib/nova b/lib/nova
index 7c6ffb2..35c6893 100644
--- a/lib/nova
+++ b/lib/nova
@@ -640,7 +640,7 @@
     local conf=${1:-$NOVA_CONF}
     iniset $conf placement auth_type "password"
     iniset $conf placement auth_url "$KEYSTONE_SERVICE_URI"
-    iniset $conf placement username placement
+    iniset $conf placement username nova
     iniset $conf placement password "$SERVICE_PASSWORD"
     iniset $conf placement user_domain_name "$SERVICE_DOMAIN_NAME"
     iniset $conf placement project_name "$SERVICE_TENANT_NAME"