From dd275006549a94ea8d7c3054816f28e96fec6aa8 Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Sat, 20 Sep 2014 14:08:10 +0200 Subject: [PATCH] labs: fix neutron admin password In the controller node's nova.conf, neutron_admin_password was set to NEUTRON_PASS instead of the correct password. Fixed. Also set neutron_admin_username and neutron_admin_password via dynamic methods (to the same values they had before). Change-Id: I69f1dbc699b9cf3252a77c1e2f085c814ef6292f --- labs/scripts/setup_neutron_controller.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/labs/scripts/setup_neutron_controller.sh b/labs/scripts/setup_neutron_controller.sh index 62d323d7..9c0464bc 100755 --- a/labs/scripts/setup_neutron_controller.sh +++ b/labs/scripts/setup_neutron_controller.sh @@ -120,9 +120,9 @@ conf=/etc/nova/nova.conf iniset_sudo $conf DEFAULT network_api_class nova.network.neutronv2.api.API iniset_sudo $conf DEFAULT neutron_url http://controller-mgmt:9696 iniset_sudo $conf DEFAULT neutron_auth_strategy keystone -iniset_sudo $conf DEFAULT neutron_admin_tenant_name service -iniset_sudo $conf DEFAULT neutron_admin_username neutron -iniset_sudo $conf DEFAULT neutron_admin_password NEUTRON_PASS +iniset_sudo $conf DEFAULT neutron_admin_tenant_name "$SERVICE_TENANT_NAME" +iniset_sudo $conf DEFAULT neutron_admin_username "$neutron_admin_user" +iniset_sudo $conf DEFAULT neutron_admin_password "$neutron_admin_password" iniset_sudo $conf DEFAULT neutron_admin_auth_url http://controller-mgmt:35357/v2.0 iniset_sudo $conf DEFAULT linuxnet_interface_driver neutron.agent.linux.interface.OVSInterfaceDriver iniset_sudo $conf DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver