Merge branch 'working' into dev

pycontribs · Aug 20, 2013 · 0d5a18b · 0d5a18b
2 parents ea910ce + ac0b46c
commit 0d5a18b
Show file tree

Hide file tree

Showing 62 changed files with 65 additions and 0 deletions.
diff --git a/samples/auth_creds_file.py b/samples/auth_creds_file.py
@@ -21,12 +21,15 @@
 import pyrax
 import pyrax.exceptions as exc
 
+pyrax.set_setting("identity_type", "rackspace")
+
 # Use a credential file in the format:
 #     [rackspace_cloud]
 #     username = myusername
 #     api_key = 01234567890abcdef
 print
 print "Using credentials file"
+# Note: you can name this file whatever you like.
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 try:
     pyrax.set_credential_file(creds_file)

diff --git a/samples/auth_direct.py b/samples/auth_direct.py
@@ -21,6 +21,8 @@
 import pyrax
 import pyrax.exceptions as exc
 
+pyrax.set_setting("identity_type", "rackspace")
+
 # Pass credentials directly (replace with your credentials)
 print "Pass directly:"
 try:

diff --git a/samples/cloud_blockstorage/attach_detach_volume.py b/samples/cloud_blockstorage/attach_detach_volume.py
@@ -21,6 +21,7 @@
 
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cs = pyrax.cloudservers

diff --git a/samples/cloud_blockstorage/create_snapshot.py b/samples/cloud_blockstorage/create_snapshot.py
@@ -22,6 +22,7 @@
 import pyrax
 import pyrax.exceptions as exc
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cbs = pyrax.cloud_blockstorage

diff --git a/samples/cloud_blockstorage/create_volume.py b/samples/cloud_blockstorage/create_volume.py
@@ -19,6 +19,7 @@
 import os
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cbs = pyrax.cloud_blockstorage

diff --git a/samples/cloud_blockstorage/delete_volume.py b/samples/cloud_blockstorage/delete_volume.py
@@ -19,6 +19,7 @@
 import os
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cbs = pyrax.cloud_blockstorage

diff --git a/samples/cloud_databases/add_database.py b/samples/cloud_databases/add_database.py
@@ -21,6 +21,7 @@
 
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cdb = pyrax.cloud_databases

diff --git a/samples/cloud_databases/add_user.py b/samples/cloud_databases/add_user.py
@@ -22,6 +22,7 @@
 
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cdb = pyrax.cloud_databases

diff --git a/samples/cloud_databases/create_instance.py b/samples/cloud_databases/create_instance.py
@@ -21,6 +21,7 @@
 
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cdb = pyrax.cloud_databases

diff --git a/samples/cloud_databases/delete_instance.py b/samples/cloud_databases/delete_instance.py
@@ -21,6 +21,7 @@
 
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cdb = pyrax.cloud_databases

diff --git a/samples/cloud_databases/list_flavors.py b/samples/cloud_databases/list_flavors.py
@@ -21,6 +21,7 @@
 
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cdb = pyrax.cloud_databases

diff --git a/samples/cloud_dns/add_ptr_records.py b/samples/cloud_dns/add_ptr_records.py
@@ -23,6 +23,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/add_records.py b/samples/cloud_dns/add_records.py
@@ -23,6 +23,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/create_domain.py b/samples/cloud_dns/create_domain.py
@@ -22,6 +22,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/create_subdomain.py b/samples/cloud_dns/create_subdomain.py
@@ -23,6 +23,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/delete_all_ptr_records.py b/samples/cloud_dns/delete_all_ptr_records.py
@@ -23,6 +23,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/delete_all_records.py b/samples/cloud_dns/delete_all_records.py
@@ -23,6 +23,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/delete_all_subdomains.py b/samples/cloud_dns/delete_all_subdomains.py
@@ -23,6 +23,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/delete_domain.py b/samples/cloud_dns/delete_domain.py
@@ -23,6 +23,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/iterate_domains.py b/samples/cloud_dns/iterate_domains.py
@@ -22,6 +22,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/list_domains.py b/samples/cloud_dns/list_domains.py
@@ -22,6 +22,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/list_ptr_records.py b/samples/cloud_dns/list_ptr_records.py
@@ -23,6 +23,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/list_records.py b/samples/cloud_dns/list_records.py
@@ -23,6 +23,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/list_subdomains.py b/samples/cloud_dns/list_subdomains.py
@@ -23,6 +23,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/update_domain.py b/samples/cloud_dns/update_domain.py
@@ -23,6 +23,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_dns/update_ptr_record.py b/samples/cloud_dns/update_ptr_record.py
@@ -23,6 +23,7 @@
 import pyrax.exceptions as exc
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 dns = pyrax.cloud_dns

diff --git a/samples/cloud_loadbalancers/add_remove_node.py b/samples/cloud_loadbalancers/add_remove_node.py
@@ -22,6 +22,7 @@
 import pyrax
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_loadbalancers/content_caching.py b/samples/cloud_loadbalancers/content_caching.py
@@ -21,6 +21,7 @@
 
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_loadbalancers/create_lb.py b/samples/cloud_loadbalancers/create_lb.py
@@ -19,6 +19,7 @@
 import os
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_loadbalancers/create_node.py b/samples/cloud_loadbalancers/create_node.py
@@ -19,6 +19,7 @@
 import os
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_loadbalancers/create_vip.py b/samples/cloud_loadbalancers/create_vip.py
@@ -18,6 +18,7 @@
 import os
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_loadbalancers/get_lb_attributes.py b/samples/cloud_loadbalancers/get_lb_attributes.py
@@ -21,6 +21,7 @@
 
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_loadbalancers/get_usage.py b/samples/cloud_loadbalancers/get_usage.py
@@ -21,6 +21,7 @@
 
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_loadbalancers/list_algorithms.py b/samples/cloud_loadbalancers/list_algorithms.py
@@ -19,6 +19,7 @@
 import os
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_loadbalancers/list_protocols.py b/samples/cloud_loadbalancers/list_protocols.py
@@ -19,6 +19,7 @@
 import os
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_loadbalancers/metadata.py b/samples/cloud_loadbalancers/metadata.py
@@ -19,6 +19,7 @@
 import os
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_loadbalancers/node_condition.py b/samples/cloud_loadbalancers/node_condition.py
@@ -19,6 +19,7 @@
 import os
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_loadbalancers/session_persistence.py b/samples/cloud_loadbalancers/session_persistence.py
@@ -21,6 +21,7 @@
 
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_loadbalancers/ssl_termination.py b/samples/cloud_loadbalancers/ssl_termination.py
@@ -21,6 +21,7 @@
 
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 clb = pyrax.cloud_loadbalancers

diff --git a/samples/cloud_networks/create_bastion.py b/samples/cloud_networks/create_bastion.py
@@ -23,6 +23,7 @@
 from pyrax import utils
 
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cs = pyrax.cloudservers

diff --git a/samples/cloud_networks/create_network.py b/samples/cloud_networks/create_network.py
@@ -20,6 +20,7 @@
 import pyrax
 from pyrax import utils
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cnw = pyrax.cloud_networks

diff --git a/samples/cloud_networks/delete_network.py b/samples/cloud_networks/delete_network.py
@@ -21,6 +21,7 @@
 from pyrax import exc
 from pyrax import utils
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 

diff --git a/samples/cloudfiles/container_cdn.py b/samples/cloudfiles/container_cdn.py
@@ -19,6 +19,7 @@
 import os
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cf = pyrax.cloudfiles

diff --git a/samples/cloudfiles/container_metadata.py b/samples/cloudfiles/container_metadata.py
@@ -22,6 +22,7 @@
 import pyrax
 import pyrax.exceptions as exc
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cf = pyrax.cloudfiles

diff --git a/samples/cloudfiles/create_container.py b/samples/cloudfiles/create_container.py
@@ -19,6 +19,7 @@
 import os
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cf = pyrax.cloudfiles

diff --git a/samples/cloudfiles/delete_objects.py b/samples/cloudfiles/delete_objects.py
@@ -22,6 +22,7 @@
 import pyrax
 import pyrax.exceptions as exc
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cf = pyrax.cloudfiles

diff --git a/samples/cloudfiles/fetch_objects.py b/samples/cloudfiles/fetch_objects.py
@@ -19,6 +19,7 @@
 import os
 import pyrax
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cf = pyrax.cloudfiles

diff --git a/samples/cloudfiles/get_objects.py b/samples/cloudfiles/get_objects.py
@@ -21,6 +21,7 @@
 import pyrax
 import pyrax.exceptions as exc
 
+pyrax.set_setting("identity_type", "rackspace")
 creds_file = os.path.expanduser("~/.rackspace_cloud_credentials")
 pyrax.set_credential_file(creds_file)
 cf = pyrax.cloudfiles