From d5ca3565db61ab365f407ba02aa8b5d1291d0bf7 Mon Sep 17 00:00:00 2001 From: Sahid Orentino Ferdjaoui Date: Sun, 12 Jan 2014 16:44:48 +0100 Subject: [PATCH] Removes deprecated config aliases Configurations that were previously deprecated in Havana are now not recognized. Change-Id: Ieb62e8add52742feea3c5eda7d5fbe794d4fba77 Closes-Bug: #1262384 --- .../Nova/Templates/SingleNode/nova/nova.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/training-guides/training-labs/Scripts/Nova/Templates/SingleNode/nova/nova.conf b/doc/training-guides/training-labs/Scripts/Nova/Templates/SingleNode/nova/nova.conf index 11417a7ad2..45a2744c1f 100644 --- a/doc/training-guides/training-labs/Scripts/Nova/Templates/SingleNode/nova/nova.conf +++ b/doc/training-guides/training-labs/Scripts/Nova/Templates/SingleNode/nova/nova.conf @@ -38,12 +38,12 @@ vncserver_listen=0.0.0.0 # Network settings network_api_class=nova.network.quantumv2.api.API -quantum_url=http://10.10.10.51:9696 -quantum_auth_strategy=keystone -quantum_admin_tenant_name=service -quantum_admin_username=quantum -quantum_admin_password=service_pass -quantum_admin_auth_url=http://10.10.10.51:35357/v2.0 +neutron_url=http://10.10.10.51:9696 +neutron_auth_strategy=keystone +neutron_admin_tenant_name=service +neutron_admin_username=quantum +neutron_admin_password=service_pass +neutron_admin_auth_url=http://10.10.10.51:35357/v2.0 linuxnet_interface_driver=nova.network.linux_net.LinuxOVSInterfaceDriver #If you want Quantum + Nova Security groups firewall_driver=nova.virt.firewall.NoopFirewallDriver @@ -52,8 +52,8 @@ security_group_api=quantum #-1-firewall_driver=nova.virt.libvirt.firewall.IptablesFirewallDriver #Metadata -service_quantum_metadata_proxy = True -quantum_metadata_proxy_shared_secret = helloOpenStack +service_neutron_metadata_proxy = True +neutron_metadata_proxy_shared_secret = helloOpenStack metadata_host = 10.10.10.51 metadata_listen = 127.0.0.1 metadata_listen_port = 8775