docs: Update OpenStack driver documentation and document how auth_url variable works. Also update affected code examples.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/64b55706 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/64b55706 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/64b55706 Branch: refs/heads/trunk Commit: 64b55706a4123153da0e20a0591100a74abc4ce9 Parents: 147e5f3 Author: Tomaz Muraus <[email protected]> Authored: Mon Nov 4 21:38:35 2013 +0000 Committer: Tomaz Muraus <[email protected]> Committed: Mon Nov 4 22:40:53 2013 +0000 ---------------------------------------------------------------------- docs/compute/drivers/openstack.rst | 7 +++++-- .../openstack/custom_service_catalog_selection_args.py | 2 +- docs/examples/compute/openstack/force_auth_token.py | 2 +- docs/examples/compute/openstack/force_base_url.py | 2 +- docs/examples/compute/openstack/simple_auth.py | 2 +- docs/examples/compute/openstack_floating_ips.py | 2 +- docs/examples/compute/openstack_simple.py | 2 +- docs/examples/compute/trystack.py | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/64b55706/docs/compute/drivers/openstack.rst ---------------------------------------------------------------------- diff --git a/docs/compute/drivers/openstack.rst b/docs/compute/drivers/openstack.rst index 807c2e8..a407209 100644 --- a/docs/compute/drivers/openstack.rst +++ b/docs/compute/drivers/openstack.rst @@ -14,8 +14,11 @@ common scenario with a default installation, you will only need to provide Available arguments: -* ``ex_force_auth_url`` - Authentication service (Keystone) API URL (e.g. - ``http://192.168.1.101:5000/v2.0``) +* ``ex_force_auth_url`` - Authentication service (Keystone) API URL. It can + either be a full URL with a path (e.g. + ``https://192.168.1.101:5000/v2.0/tokens/``) or a base URL without a path + (e.g. ``https://192.168.1.1``). If no path is provided, default path for the + provided auth version is appended to the base URL. * ``ex_force_auth_version`` - API version of the authentication service. This argument determines how authentication is performed. Valid and supported versions are: http://git-wip-us.apache.org/repos/asf/libcloud/blob/64b55706/docs/examples/compute/openstack/custom_service_catalog_selection_args.py ---------------------------------------------------------------------- diff --git a/docs/examples/compute/openstack/custom_service_catalog_selection_args.py b/docs/examples/compute/openstack/custom_service_catalog_selection_args.py index f05c266..663a3d8 100644 --- a/docs/examples/compute/openstack/custom_service_catalog_selection_args.py +++ b/docs/examples/compute/openstack/custom_service_catalog_selection_args.py @@ -11,7 +11,7 @@ libcloud.security.VERIFY_SSL_CERT = False OpenStack = get_driver(Provider.OPENSTACK) driver = OpenStack('your_auth_username', 'your_auth_password', - ex_force_auth_url='http://192.168.1.101:5000/v2.0', + ex_force_auth_url='http://192.168.1.101:5000', ex_force_auth_version='2.0_password', ex_force_service_type='compute', ex_force_service_name='novaCompute', http://git-wip-us.apache.org/repos/asf/libcloud/blob/64b55706/docs/examples/compute/openstack/force_auth_token.py ---------------------------------------------------------------------- diff --git a/docs/examples/compute/openstack/force_auth_token.py b/docs/examples/compute/openstack/force_auth_token.py index 90a0ee3..f926186 100644 --- a/docs/examples/compute/openstack/force_auth_token.py +++ b/docs/examples/compute/openstack/force_auth_token.py @@ -11,6 +11,6 @@ libcloud.security.VERIFY_SSL_CERT = False OpenStack = get_driver(Provider.OPENSTACK) driver = OpenStack('your_auth_username', 'your_auth_password', - ex_force_auth_url='http://192.168.1.101:5000/v2.0', + ex_force_auth_url='http://192.168.1.101:5000', ex_force_auth_version='2.0_password', ex_force_auth_token='authtoken') http://git-wip-us.apache.org/repos/asf/libcloud/blob/64b55706/docs/examples/compute/openstack/force_base_url.py ---------------------------------------------------------------------- diff --git a/docs/examples/compute/openstack/force_base_url.py b/docs/examples/compute/openstack/force_base_url.py index 25556e9..797df23 100644 --- a/docs/examples/compute/openstack/force_base_url.py +++ b/docs/examples/compute/openstack/force_base_url.py @@ -11,6 +11,6 @@ libcloud.security.VERIFY_SSL_CERT = False OpenStack = get_driver(Provider.OPENSTACK) driver = OpenStack('your_auth_username', 'your_auth_password', - ex_force_auth_url='http://192.168.1.101:5000/v2.0', + ex_force_auth_url='http://192.168.1.101:5000', ex_force_auth_version='2.0_password', ex_force_base_url='http://192.168.1.101:3000/v1/12345') http://git-wip-us.apache.org/repos/asf/libcloud/blob/64b55706/docs/examples/compute/openstack/simple_auth.py ---------------------------------------------------------------------- diff --git a/docs/examples/compute/openstack/simple_auth.py b/docs/examples/compute/openstack/simple_auth.py index 65659c9..8a5ea79 100644 --- a/docs/examples/compute/openstack/simple_auth.py +++ b/docs/examples/compute/openstack/simple_auth.py @@ -11,5 +11,5 @@ libcloud.security.VERIFY_SSL_CERT = False OpenStack = get_driver(Provider.OPENSTACK) driver = OpenStack('your_auth_username', 'your_auth_password', - ex_force_auth_url='http://192.168.1.101:5000/v2.0', + ex_force_auth_url='http://192.168.1.101:5000', ex_force_auth_version='2.0_password') http://git-wip-us.apache.org/repos/asf/libcloud/blob/64b55706/docs/examples/compute/openstack_floating_ips.py ---------------------------------------------------------------------- diff --git a/docs/examples/compute/openstack_floating_ips.py b/docs/examples/compute/openstack_floating_ips.py index 203e3ea..9f7eb76 100644 --- a/docs/examples/compute/openstack_floating_ips.py +++ b/docs/examples/compute/openstack_floating_ips.py @@ -11,7 +11,7 @@ libcloud.security.VERIFY_SSL_CERT = False OpenStack = get_driver(Provider.OPENSTACK) driver = OpenStack('your_auth_username', 'your_auth_password', - ex_force_auth_url='http://10.0.4.1:5000/v2.0', + ex_force_auth_url='http://10.0.4.1:5000', ex_force_auth_version='2.0_password', ex_tenant_name='your_tenant') http://git-wip-us.apache.org/repos/asf/libcloud/blob/64b55706/docs/examples/compute/openstack_simple.py ---------------------------------------------------------------------- diff --git a/docs/examples/compute/openstack_simple.py b/docs/examples/compute/openstack_simple.py index 65659c9..8a5ea79 100644 --- a/docs/examples/compute/openstack_simple.py +++ b/docs/examples/compute/openstack_simple.py @@ -11,5 +11,5 @@ libcloud.security.VERIFY_SSL_CERT = False OpenStack = get_driver(Provider.OPENSTACK) driver = OpenStack('your_auth_username', 'your_auth_password', - ex_force_auth_url='http://192.168.1.101:5000/v2.0', + ex_force_auth_url='http://192.168.1.101:5000', ex_force_auth_version='2.0_password') http://git-wip-us.apache.org/repos/asf/libcloud/blob/64b55706/docs/examples/compute/trystack.py ---------------------------------------------------------------------- diff --git a/docs/examples/compute/trystack.py b/docs/examples/compute/trystack.py index 6ba3950..c3db4a2 100644 --- a/docs/examples/compute/trystack.py +++ b/docs/examples/compute/trystack.py @@ -14,7 +14,7 @@ libcloud.security.VERIFY_SSL_CERT = False OpenStack = get_driver(Provider.OPENSTACK) driver = OpenStack('your username', 'your password', - ex_force_auth_url='https://nova-api.trystack.org:5443/v2.0', + ex_force_auth_url='https://nova-api.trystack.org:5443', ex_force_auth_version='2.0_password') nodes = driver.list_nodes()
