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
This commit is contained in:
Roger Luethi 2014-09-20 14:08:10 +02:00
parent ec7422a2b9
commit dd27500654

@ -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