Removing zone choices that overly-limit available zones for gce

Fixes #7270
This commit is contained in:
James Cammarata 2014-05-05 11:57:58 -05:00
parent ef741178c4
commit faf733bc49
2 changed files with 1 additions and 5 deletions

View file

@ -107,7 +107,6 @@ options:
- the GCE zone to use - the GCE zone to use
required: true required: true
default: "us-central1-a" default: "us-central1-a"
choices: ["us-central1-a", "us-central1-b", "us-central2-a", "europe-west1-a", "europe-west1-b"]
aliases: [] aliases: []
requirements: [ "libcloud" ] requirements: [ "libcloud" ]
@ -355,9 +354,7 @@ def main():
state = dict(choices=['active', 'present', 'absent', 'deleted'], state = dict(choices=['active', 'present', 'absent', 'deleted'],
default='present'), default='present'),
tags = dict(type='list'), tags = dict(type='list'),
zone = dict(choices=['us-central1-a', 'us-central1-b', zone = dict(default='us-central1-a'),
'us-central2-a', 'europe-west1-a', 'europe-west1-b'],
default='us-central1-a'),
service_account_email = dict(), service_account_email = dict(),
pem_file = dict(), pem_file = dict(),
project_id = dict(), project_id = dict(),

View file

@ -88,7 +88,6 @@ options:
description: description:
- the GCE region where the load-balancer is defined - the GCE region where the load-balancer is defined
required: false required: false
choices: ["us-central1", "us-central2", "europe-west1"]
external_ip: external_ip:
description: description:
- the external static IPv4 (or auto-assigned) address for the LB - the external static IPv4 (or auto-assigned) address for the LB