summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova/nova.conf21
1 files changed, 11 insertions, 10 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index f484528..fe4d756 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -35,6 +35,7 @@ network_manager = nova.network.manager.FlatDHCPManager
35fixed_range= 35fixed_range=
36force_dhcp_release=False 36force_dhcp_release=False
37dhcpbridge=/usr/bin/nova-dhcpbridge 37dhcpbridge=/usr/bin/nova-dhcpbridge
38network_api_class=nova.network.neutronv2.api.API
38 39
39#Database configuration 40#Database configuration
40sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@%CONTROLLER_IP%/nova 41sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@%CONTROLLER_IP%/nova
@@ -44,15 +45,6 @@ rpc_backend = nova.rpc.impl_kombu
44rabbit_host = %CONTROLLER_IP% 45rabbit_host = %CONTROLLER_IP%
45rabbit_port = 5672 46rabbit_port = 5672
46 47
47# Neutron
48neutron_url=http://%CONTROLLER_IP%:9696
49network_api_class=nova.network.neutronv2.api.API
50neutron_auth_strategy=keystone
51neutron_admin_tenant_name=service
52neutron_admin_username=neutron
53neutron_admin_password=password
54neutron_admin_auth_url=http://%CONTROLLER_IP%:8081/keystone/main/v2.0
55
56# Disables reporting of network state to the controller 48# Disables reporting of network state to the controller
57vif_plugging_timeout=10 49vif_plugging_timeout=10
58vif_plugging_is_fatal=False 50vif_plugging_is_fatal=False
@@ -84,7 +76,6 @@ keymap=en-us
84server_listen=%COMPUTE_IP% 76server_listen=%COMPUTE_IP%
85server_proxyclient_address=%COMPUTE_IP% 77server_proxyclient_address=%COMPUTE_IP%
86 78
87auth_strategy=keystone
88[keystone_authtoken] 79[keystone_authtoken]
89identity_uri=http://127.0.0.1:8081/keystone/admin 80identity_uri=http://127.0.0.1:8081/keystone/admin
90admin_tenant_name = %SERVICE_TENANT_NAME% 81admin_tenant_name = %SERVICE_TENANT_NAME%
@@ -95,3 +86,13 @@ admin_password = %SERVICE_PASSWORD%
95virt_type = kvm 86virt_type = kvm
96libvirt_cpu_mode = none 87libvirt_cpu_mode = none
97libvirt_images_type = %LIBVIRT_IMAGES_TYPE% 88libvirt_images_type = %LIBVIRT_IMAGES_TYPE%
89
90[neutron]
91# Neutron
92url=http://%CONTROLLER_IP%:9696
93auth_strategy=keystone
94admin_tenant_name=service
95admin_username=neutron
96admin_password=password
97admin_auth_url=http://%CONTROLLER_IP%:8081/keystone/main/v2.0
98