diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova/nova.conf | 6 | ||||
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova/openrc | 4 |
2 files changed, 4 insertions, 6 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 | |||
| 50 | neutron_admin_tenant_name=service | 50 | neutron_admin_tenant_name=service |
| 51 | neutron_admin_username=neutron | 51 | neutron_admin_username=neutron |
| 52 | neutron_admin_password=password | 52 | neutron_admin_password=password |
| 53 | neutron_admin_auth_url=http://%CONTROLLER_IP%:5000/v2.0/ | 53 | neutron_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 |
| 56 | vif_plugging_timeout=10 | 56 | vif_plugging_timeout=10 |
| @@ -85,9 +85,7 @@ server_proxyclient_address=%COMPUTE_IP% | |||
| 85 | 85 | ||
| 86 | auth_strategy=keystone | 86 | auth_strategy=keystone |
| 87 | [keystone_authtoken] | 87 | [keystone_authtoken] |
| 88 | auth_host = %CONTROLLER_IP% | 88 | identity_uri=http://127.0.0.1:8081/keystone/admin |
| 89 | auth_port = 35357 | ||
| 90 | auth_protocol = http | ||
| 91 | admin_tenant_name = %SERVICE_TENANT_NAME% | 89 | admin_tenant_name = %SERVICE_TENANT_NAME% |
| 92 | admin_user = %SERVICE_USER% | 90 | admin_user = %SERVICE_USER% |
| 93 | admin_password = %SERVICE_PASSWORD% | 91 | admin_password = %SERVICE_PASSWORD% |
diff --git a/meta-openstack/recipes-devtools/python/python-nova/openrc b/meta-openstack/recipes-devtools/python/python-nova/openrc index 35327ac..e8507f2 100644 --- a/meta-openstack/recipes-devtools/python/python-nova/openrc +++ b/meta-openstack/recipes-devtools/python/python-nova/openrc | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | export OS_TENANT_NAME=admin | 1 | export OS_TENANT_NAME=admin |
| 2 | export OS_USERNAME=admin | 2 | export OS_USERNAME=admin |
| 3 | export OS_PASSWORD=%OS_PASSWORD% | 3 | export OS_PASSWORD=%OS_PASSWORD% |
| 4 | export OS_AUTH_URL="http://%CONTROLLER_HOST%:5000/v2.0/" | 4 | export OS_AUTH_URL="http://%CONTROLLER_HOST%:8081/keystone/main/v2.0/" |
| 5 | export SERVICE_ENDPOINT="http://%CONTROLLER_HOST%:35357/v2.0" | 5 | export SERVICE_ENDPOINT="http://%CONTROLLER_HOST%:8081/keystone/admin/v2.0" |
| 6 | export SERVICE_TOKEN=%SERVICE_TOKEN% | 6 | export SERVICE_TOKEN=%SERVICE_TOKEN% |
| 7 | 7 | ||
| 8 | function get_field() { | 8 | function get_field() { |
