From 267052d7a5d113c411b04048053c0680722fc9df Mon Sep 17 00:00:00 2001 From: Ethan Devenport Date: Tue, 23 Aug 2016 07:52:39 +0000 Subject: [PATCH] Removed us/lasdev datacenter which the cloud provider no longer maintains. --- .../modules/extras/cloud/profitbricks/profitbricks.py | 5 ++--- .../extras/cloud/profitbricks/profitbricks_datacenter.py | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/ansible/modules/extras/cloud/profitbricks/profitbricks.py b/lib/ansible/modules/extras/cloud/profitbricks/profitbricks.py index 0a1e299949..e01d74777d 100644 --- a/lib/ansible/modules/extras/cloud/profitbricks/profitbricks.py +++ b/lib/ansible/modules/extras/cloud/profitbricks/profitbricks.py @@ -89,7 +89,7 @@ options: - The datacenter location. Use only if you want to create the Datacenter or else this value is ignored. required: false default: us/las - choices: [ "us/las", "us/lasdev", "de/fra", "de/fkb" ] + choices: [ "us/las", "de/fra", "de/fkb" ] assign_public_ip: description: - This will assign the machine to the public LAN. If no LAN exists with public Internet access it is created. @@ -205,8 +205,7 @@ except ImportError: LOCATIONS = ['us/las', 'de/fra', - 'de/fkb', - 'us/lasdev'] + 'de/fkb'] uuid_match = re.compile( '[\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12}', re.I) diff --git a/lib/ansible/modules/extras/cloud/profitbricks/profitbricks_datacenter.py b/lib/ansible/modules/extras/cloud/profitbricks/profitbricks_datacenter.py index cd0e38ee38..0b21d3e4cd 100644 --- a/lib/ansible/modules/extras/cloud/profitbricks/profitbricks_datacenter.py +++ b/lib/ansible/modules/extras/cloud/profitbricks/profitbricks_datacenter.py @@ -35,7 +35,7 @@ options: - The datacenter location. required: false default: us/las - choices: [ "us/las", "us/lasdev", "de/fra", "de/fkb" ] + choices: [ "us/las", "de/fra", "de/fkb" ] subscription_user: description: - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environement variable. @@ -94,8 +94,7 @@ except ImportError: LOCATIONS = ['us/las', 'de/fra', - 'de/fkb', - 'us/lasdev'] + 'de/fkb'] uuid_match = re.compile( '[\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12}', re.I) @@ -206,7 +205,7 @@ def main(): argument_spec=dict( name=dict(), description=dict(), - location=dict(choices=LOCATIONS, default='us/lasdev'), + location=dict(choices=LOCATIONS, default='us/las'), subscription_user=dict(), subscription_password=dict(), wait=dict(type='bool', default=True), @@ -256,4 +255,4 @@ def main(): from ansible.module_utils.basic import * -main() \ No newline at end of file +main()