Skip to content

SAVI 2.1 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mfaraji wants to merge 3 commits into
base: silver
Choose a base branch
from
Open

SAVI 2.1 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59f9f8c
Merge branch 'silver', remote-tracking branch 'upstream/silver' into …
mfaraji Aug 6, 2013
a17afc2
Add Authorization Stub to nova
mfaraji Aug 6, 2013
2335370
fix nova to pass quantum_url in noauth authentication
mfaraji Aug 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions etc/nova/api-paste.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ use = call:nova.api.openstack.urlmap:urlmap_factory
[composite:openstack_compute_api_v2]
use = call:nova.api.auth:pipeline_factory
noauth = faultwrap sizelimit noauth ratelimit osapi_compute_app_v2
keystone = faultwrap sizelimit authtoken keystonecontext ratelimit osapi_compute_app_v2
keystone_nolimit = faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v2
keystone = faultwrap sizelimit authtoken authz keystonecontext ratelimit osapi_compute_app_v2
keystone_nolimit = faultwrap sizelimit authtoken authz keystonecontext osapi_compute_app_v2

[composite:openstack_volume_api_v1]
use = call:nova.api.auth:pipeline_factory
Expand Down Expand Up @@ -117,11 +117,23 @@ paste.app_factory = nova.api.openstack.volume.versions:Versions.factory
paste.filter_factory = nova.api.auth:NovaKeystoneContext.factory

[filter:authtoken]
paste.filter_factory = keystone.middleware.auth_token:filter_factory
paste.filter_factory = keystoneiclient.middleware.auth_token:filter_factory
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USER%
admin_password = %SERVICE_PASSWORD%
signing_dirname = /tmp/keystone-signing-nova
signing_dirname = /tmp/keystone-signing-novai

[filter:authtoken]
paste.filter_factory = keystoneclient.middleware.authoriztion.authz:filter_factory
auth_host = 127.0.0.1
auth_port = 35357
auth_protocol = http
admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USER%
admin_password = %SERVICE_PASSWORD%
service = compute
stub_mode= True

16 changes: 8 additions & 8 deletions nova/network/quantumv2/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ def _get_auth_token():


def get_client(context):
token = context.auth_token
if not token:
if FLAGS.quantum_auth_strategy:
token = _get_auth_token()
if token:
my_client = clientv20.Client(
endpoint_url=FLAGS.quantum_url,
token=token, timeout=FLAGS.quantum_url_timeout)
if FLAGS.quantum_auth_strategy and FLAGS.quantum_auth_strategy != 'noauth':
token = context.auth_token
if not token:
token = _get_auth_token()
if token:
my_client = clientv20.Client(
endpoint_url=FLAGS.quantum_url,
token=token, timeout=FLAGS.quantum_url_timeout)
else:
my_client = clientv20.Client(
endpoint_url=FLAGS.quantum_url,
Expand Down