summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-nova/nova.conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova/nova.conf')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova/nova.conf6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index 09ae44c..3cb143d 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -50,7 +50,7 @@ neutron_auth_strategy=keystone
50neutron_admin_tenant_name=service 50neutron_admin_tenant_name=service
51neutron_admin_username=neutron 51neutron_admin_username=neutron
52neutron_admin_password=password 52neutron_admin_password=password
53neutron_admin_auth_url=http://%CONTROLLER_IP%:5000/v2.0/ 53neutron_admin_auth_url=http://%CONTROLLER_IP%:8081/keystone/main/v2.0
54 54
55# Disables reporting of network state to the controller 55# Disables reporting of network state to the controller
56vif_plugging_timeout=10 56vif_plugging_timeout=10
@@ -85,9 +85,7 @@ server_proxyclient_address=%COMPUTE_IP%
85 85
86auth_strategy=keystone 86auth_strategy=keystone
87[keystone_authtoken] 87[keystone_authtoken]
88auth_host = %CONTROLLER_IP% 88identity_uri=http://127.0.0.1:8081/keystone/admin
89auth_port = 35357
90auth_protocol = http
91admin_tenant_name = %SERVICE_TENANT_NAME% 89admin_tenant_name = %SERVICE_TENANT_NAME%
92admin_user = %SERVICE_USER% 90admin_user = %SERVICE_USER%
93admin_password = %SERVICE_PASSWORD% 91admin_password = %SERVICE_PASSWORD%