wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed us/lasdev datacenter which the cloud provider no longer maintains.

Browse source
This commit is contained in:
Ethan Devenport 2016-08-23 07:52:39 +00:00 committed by Matt Clay
parent 6d8e3eac7b
commit 267052d7a5
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/extras/cloud/profitbricks/profitbricks.py
View file

@ -89,7 +89,7 @@ options:
- The datacenter location. Use only if you want to create the Datacenter or else this value is ignored. - The datacenter location. Use only if you want to create the Datacenter or else this value is ignored.
required: false required: false
default: us/las default: us/las
choices: [ "us/las", "us/lasdev", "de/fra", "de/fkb" ] choices: [ "us/las", "de/fra", "de/fkb" ]
assign_public_ip: assign_public_ip:
description: description:
- This will assign the machine to the public LAN. If no LAN exists with public Internet access it is created. - 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', LOCATIONS = ['us/las',
'de/fra', 'de/fra',
'de/fkb', 'de/fkb']
'us/lasdev']
uuid_match = re.compile( uuid_match = re.compile(
'[\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12}', re.I) '[\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12}', re.I)

7
lib/ansible/modules/extras/cloud/profitbricks/profitbricks_datacenter.py
View file

@ -35,7 +35,7 @@ options:
- The datacenter location. - The datacenter location.
required: false required: false
default: us/las default: us/las
choices: [ "us/las", "us/lasdev", "de/fra", "de/fkb" ] choices: [ "us/las", "de/fra", "de/fkb" ]
subscription_user: subscription_user:
description: description:
- The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environement variable. - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environement variable.
@ -94,8 +94,7 @@ except ImportError:
LOCATIONS = ['us/las', LOCATIONS = ['us/las',
'de/fra', 'de/fra',
'de/fkb', 'de/fkb']
'us/lasdev']
uuid_match = re.compile( uuid_match = re.compile(
'[\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12}', re.I) '[\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12}', re.I)
@ -206,7 +205,7 @@ def main():
argument_spec=dict( argument_spec=dict(
name=dict(), name=dict(),
description=dict(), description=dict(),
location=dict(choices=LOCATIONS, default='us/lasdev'), location=dict(choices=LOCATIONS, default='us/las'),
subscription_user=dict(), subscription_user=dict(),
subscription_password=dict(), subscription_password=dict(),
wait=dict(type='bool', default=True), wait=dict(type='bool', default=True),