diff options
Diffstat (limited to 'meta-openstack')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova/nova.conf | 21 |
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 | |||
35 | fixed_range= | 35 | fixed_range= |
36 | force_dhcp_release=False | 36 | force_dhcp_release=False |
37 | dhcpbridge=/usr/bin/nova-dhcpbridge | 37 | dhcpbridge=/usr/bin/nova-dhcpbridge |
38 | network_api_class=nova.network.neutronv2.api.API | ||
38 | 39 | ||
39 | #Database configuration | 40 | #Database configuration |
40 | sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@%CONTROLLER_IP%/nova | 41 | sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@%CONTROLLER_IP%/nova |
@@ -44,15 +45,6 @@ rpc_backend = nova.rpc.impl_kombu | |||
44 | rabbit_host = %CONTROLLER_IP% | 45 | rabbit_host = %CONTROLLER_IP% |
45 | rabbit_port = 5672 | 46 | rabbit_port = 5672 |
46 | 47 | ||
47 | # Neutron | ||
48 | neutron_url=http://%CONTROLLER_IP%:9696 | ||
49 | network_api_class=nova.network.neutronv2.api.API | ||
50 | neutron_auth_strategy=keystone | ||
51 | neutron_admin_tenant_name=service | ||
52 | neutron_admin_username=neutron | ||
53 | neutron_admin_password=password | ||
54 | neutron_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 |
57 | vif_plugging_timeout=10 | 49 | vif_plugging_timeout=10 |
58 | vif_plugging_is_fatal=False | 50 | vif_plugging_is_fatal=False |
@@ -84,7 +76,6 @@ keymap=en-us | |||
84 | server_listen=%COMPUTE_IP% | 76 | server_listen=%COMPUTE_IP% |
85 | server_proxyclient_address=%COMPUTE_IP% | 77 | server_proxyclient_address=%COMPUTE_IP% |
86 | 78 | ||
87 | auth_strategy=keystone | ||
88 | [keystone_authtoken] | 79 | [keystone_authtoken] |
89 | identity_uri=http://127.0.0.1:8081/keystone/admin | 80 | identity_uri=http://127.0.0.1:8081/keystone/admin |
90 | admin_tenant_name = %SERVICE_TENANT_NAME% | 81 | admin_tenant_name = %SERVICE_TENANT_NAME% |
@@ -95,3 +86,13 @@ admin_password = %SERVICE_PASSWORD% | |||
95 | virt_type = kvm | 86 | virt_type = kvm |
96 | libvirt_cpu_mode = none | 87 | libvirt_cpu_mode = none |
97 | libvirt_images_type = %LIBVIRT_IMAGES_TYPE% | 88 | libvirt_images_type = %LIBVIRT_IMAGES_TYPE% |
89 | |||
90 | [neutron] | ||
91 | # Neutron | ||
92 | url=http://%CONTROLLER_IP%:9696 | ||
93 | auth_strategy=keystone | ||
94 | admin_tenant_name=service | ||
95 | admin_username=neutron | ||
96 | admin_password=password | ||
97 | admin_auth_url=http://%CONTROLLER_IP%:8081/keystone/main/v2.0 | ||
98 | |||