Repository: libcloud Updated Branches: refs/heads/trunk b1110a051 -> bb2896155
Updated documentation for HP Cloud Closes #262 Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/bb289615 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/bb289615 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/bb289615 Branch: refs/heads/trunk Commit: bb2896155061e7feb112762f92b99e5ce58c9ccc Parents: b1110a0 Author: CaptTofu <[email protected]> Authored: Wed Mar 12 10:02:20 2014 -0700 Committer: Tomaz Muraus <[email protected]> Committed: Fri Mar 14 17:10:48 2014 +0100 ---------------------------------------------------------------------- docs/compute/drivers/openstack.rst | 2 +- docs/examples/compute/openstack/hpcloud.py | 31 +++++++------------------ 2 files changed, 9 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/bb289615/docs/compute/drivers/openstack.rst ---------------------------------------------------------------------- diff --git a/docs/compute/drivers/openstack.rst b/docs/compute/drivers/openstack.rst index ae915d4..cd8fc91 100644 --- a/docs/compute/drivers/openstack.rst +++ b/docs/compute/drivers/openstack.rst @@ -107,7 +107,7 @@ token before the currently used one is about to expire. 5. HP Cloud (www.hpcloud.com) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Connecting to HP Cloud US West AZ 1-3 (OpenStack Havana) and US East (OpenStack Horizon). +Connecting to HP Cloud US West and US East (OpenStack Havana). .. literalinclude:: /examples/compute/openstack/hpcloud.py :language: python http://git-wip-us.apache.org/repos/asf/libcloud/blob/bb289615/docs/examples/compute/openstack/hpcloud.py ---------------------------------------------------------------------- diff --git a/docs/examples/compute/openstack/hpcloud.py b/docs/examples/compute/openstack/hpcloud.py index 168e6ec..0b226b5 100644 --- a/docs/examples/compute/openstack/hpcloud.py +++ b/docs/examples/compute/openstack/hpcloud.py @@ -1,40 +1,25 @@ from libcloud.compute.types import Provider from libcloud.compute.providers import get_driver -HPCLOUD_AUTH_URL = \ +HPCLOUD_AUTH_URL_USWEST = \ 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/tokens' -OpenStack = get_driver(Provider.OPENSTACK) - -#HP Cloud US West AZ 1 -driver = OpenStack('your_auth_username', 'your_auth_password', - ex_force_auth_version='2.0_password', - ex_force_auth_url=HPCLOUD_AUTH_URL, - ex_tenant_name='your_tenant_name', - ex_force_service_region='az-1.region-a.geo-1', - ex_force_service_name='Compute') - -#HP Cloud US West AZ 2 -driver = OpenStack('your_auth_username', 'your_auth_password', - ex_force_auth_version='2.0_password', - ex_force_auth_url=HPCLOUD_AUTH_URL, - ex_tenant_name='your_tenant_name', - ex_force_service_region='az-2.region-a.geo-1', - ex_force_service_name='Compute') +HPCLOUD_AUTH_URL_USEAST = \ + 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/tokens' +OpenStack = get_driver(Provider.OPENSTACK) -#HP Cloud US West AZ 3 +#HP Cloud US West driver = OpenStack('your_auth_username', 'your_auth_password', ex_force_auth_version='2.0_password', - ex_force_auth_url=HPCLOUD_AUTH_URL, + ex_force_auth_url=HPCLOUD_AUTH_URL_USWEST, ex_tenant_name='your_tenant_name', - ex_force_service_region='az-3.region-a.geo-1', + ex_force_service_region='region-a.geo-1', ex_force_service_name='Compute') - #HP Cloud US East driver = OpenStack('your_auth_username', 'your_auth_password', ex_force_auth_version='2.0_password', - ex_force_auth_url=HPCLOUD_AUTH_URL, + ex_force_auth_url=HPCLOUD_AUTH_URL_USEAST, ex_tenant_name='your_tenant_name', ex_force_service_region='region-b.geo-1', ex_force_service_name='Compute')
