add RegionDiskType

This commit is contained in:
Dana Hoffman 2018-08-16 18:18:40 +00:00 committed by Alex Stephen
parent 7c4d1c582b
commit 3382f7f7b2

View file

@ -89,6 +89,15 @@ options:
of sizeGb must not be less than the size of the sourceImage or the size of the of sizeGb must not be less than the size of the sourceImage or the size of the
snapshot. snapshot.
required: false required: false
physical_block_size_bytes:
description:
- Physical block size of the persistent disk, in bytes. If not present in a request,
a default value is used. Currently supported sizes are 4096 and 16384, other
sizes may be added in the future.
- If an unsupported value is requested, the error message will list the supported
values for the caller's project.
required: false
version_added: 2.8
type: type:
description: description:
- URL of the disk type resource describing which disk type to use to create the - URL of the disk type resource describing which disk type to use to create the
@ -124,11 +133,6 @@ options:
- Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648
base64 to either encrypt or decrypt this resource. base64 to either encrypt or decrypt this resource.
required: false required: false
sha256:
description:
- The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption
key that protects this resource.
required: false
kms_key_name: kms_key_name:
description: description:
- The name of the encryption key that is stored in Google Cloud KMS. - The name of the encryption key that is stored in Google Cloud KMS.
@ -150,11 +154,6 @@ options:
- Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648
base64 to either encrypt or decrypt this resource. base64 to either encrypt or decrypt this resource.
required: false required: false
sha256:
description:
- The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption
key that protects this resource.
required: false
kms_key_name: kms_key_name:
description: description:
- The name of the encryption key that is stored in Google Cloud KMS. - The name of the encryption key that is stored in Google Cloud KMS.
@ -164,9 +163,10 @@ options:
- The source snapshot used to create this disk. You can provide this as a partial - The source snapshot used to create this disk. You can provide this as a partial
or full URL to the resource. or full URL to the resource.
- 'This field represents a link to a Snapshot resource in GCP. It can be specified - 'This field represents a link to a Snapshot resource in GCP. It can be specified
in two ways. First, you can place in the selfLink of the resource here as a in two ways. First, you can place a dictionary with key ''selfLink'' and value
string Alternatively, you can add `register: name-of-resource` to a gcp_compute_snapshot of your resource''s selfLink Alternatively, you can add `register: name-of-resource`
task and then set this source_snapshot field to "{{ name-of-resource }}"' to a gcp_compute_snapshot task and then set this source_snapshot field to "{{
name-of-resource }}"'
required: false required: false
source_snapshot_encryption_key: source_snapshot_encryption_key:
description: description:
@ -183,228 +183,203 @@ options:
description: description:
- The name of the encryption key that is stored in Google Cloud KMS. - The name of the encryption key that is stored in Google Cloud KMS.
required: false required: false
sha256:
description:
- The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption
key that protects this resource.
required: false
extends_documentation_fragment: gcp extends_documentation_fragment: gcp
notes: notes:
- 'API Reference: U(https://cloud.google.com/compute/docs/reference/latest/disks)' - 'API Reference: U(https://cloud.google.com/compute/docs/reference/v1/disks)'
- 'Adding a persistent disk: U(https://cloud.google.com/compute/docs/disks/add-persistent-disk)' - 'Adding a persistent disk: U(https://cloud.google.com/compute/docs/disks/add-persistent-disk)'
''' '''
EXAMPLES = ''' EXAMPLES = '''
- name: create a disk - name: create a disk
gcp_compute_disk: gcp_compute_disk:
name: "test_object" name: test_object
size_gb: 50 size_gb: 50
disk_encryption_key: disk_encryption_key:
raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0= raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
zone: us-central1-a zone: us-central1-a
project: "test_project" project: test_project
auth_kind: "serviceaccount" auth_kind: serviceaccount
service_account_file: "/tmp/auth.pem" service_account_file: "/tmp/auth.pem"
state: present state: present
''' '''
RETURN = ''' RETURN = '''
labelFingerprint: creation_timestamp:
description: description:
- The fingerprint used for optimistic locking of this resource. Used internally - Creation timestamp in RFC3339 text format.
during updates. returned: success
returned: success type: str
type: str description:
creationTimestamp: description:
description: - An optional description of this resource. Provide this property when you create
- Creation timestamp in RFC3339 text format. the resource.
returned: success returned: success
type: str type: str
description: id:
description: description:
- An optional description of this resource. Provide this property when you create - The unique identifier for the resource.
the resource. returned: success
returned: success type: int
type: str last_attach_timestamp:
id: description:
description: - Last attach timestamp in RFC3339 text format.
- The unique identifier for the resource. returned: success
returned: success type: str
type: int last_detach_timestamp:
lastAttachTimestamp: description:
description: - Last dettach timestamp in RFC3339 text format.
- Last attach timestamp in RFC3339 text format. returned: success
returned: success type: str
type: str labels:
lastDetachTimestamp: description:
description: - Labels to apply to this disk. A list of key->value pairs.
- Last dettach timestamp in RFC3339 text format. returned: success
returned: success type: dict
type: str licenses:
labels: description:
description: - Any applicable publicly visible licenses.
- Labels to apply to this disk. A list of key->value pairs. returned: success
returned: success type: list
type: dict name:
licenses: description:
description: - Name of the resource. Provided by the client when the resource is created. The name
- Any applicable publicly visible licenses. must be 1-63 characters long, and comply with RFC1035. Specifically, the name must
returned: success be 1-63 characters long and match the regular expression `[a-z]([-a-z0-9]*[a-z0-9])?`
type: list which means the first character must be a lowercase letter, and all following characters
name: must be a dash, lowercase letter, or digit, except the last character, which cannot
description: be a dash.
- Name of the resource. Provided by the client when the resource is created. The returned: success
name must be 1-63 characters long, and comply with RFC1035. Specifically, the type: str
name must be 1-63 characters long and match the regular expression `[a-z]([-a-z0-9]*[a-z0-9])?` size_gb:
which means the first character must be a lowercase letter, and all following description:
characters must be a dash, lowercase letter, or digit, except the last character, - Size of the persistent disk, specified in GB. You can specify this field when creating
which cannot be a dash. a persistent disk using the sourceImage or sourceSnapshot parameter, or specify
returned: success it alone to create an empty persistent disk.
type: str - If you specify this field along with sourceImage or sourceSnapshot, the value of
sizeGb: sizeGb must not be less than the size of the sourceImage or the size of the snapshot.
description: returned: success
- Size of the persistent disk, specified in GB. You can specify this field when type: int
creating a persistent disk using the sourceImage or sourceSnapshot parameter, users:
or specify it alone to create an empty persistent disk. description:
- If you specify this field along with sourceImage or sourceSnapshot, the value - 'Links to the users of the disk (attached instances) in form: project/zones/zone/instances/instance
of sizeGb must not be less than the size of the sourceImage or the size of the .'
snapshot. returned: success
returned: success type: list
type: int type:
users: description:
description: - URL of the disk type resource describing which disk type to use to create the disk.
- 'Links to the users of the disk (attached instances) in form: project/zones/zone/instances/instance Provide this when creating the disk.
.' returned: success
returned: success type: str
type: list source_image:
type: description:
description: - The source image used to create this disk. If the source image is deleted, this
- URL of the disk type resource describing which disk type to use to create the field will not be set.
disk. Provide this when creating the disk. - 'To create a disk with one of the public operating system images, specify the image
returned: success by its family name. For example, specify family/debian-8 to use the latest Debian
type: str 8 image: projects/debian-cloud/global/images/family/debian-8 Alternatively, use
sourceImage: a specific version of a public operating system image: projects/debian-cloud/global/images/debian-8-jessie-vYYYYMMDD To
description: create a disk with a private image that you created, specify the image name in the
- The source image used to create this disk. If the source image is deleted, this following format: global/images/my-private-image You can also specify a private
field will not be set. image by its image family, which returns the latest version of the image in that
- 'To create a disk with one of the public operating system images, specify the family. Replace the image name with family/family-name: global/images/family/my-private-family
image by its family name. For example, specify family/debian-8 to use the latest .'
Debian 8 image: projects/debian-cloud/global/images/family/debian-8 Alternatively, returned: success
use a specific version of a public operating system image: projects/debian-cloud/global/images/debian-8-jessie-vYYYYMMDD type: str
To create a disk with a private image that you created, specify the image name zone:
in the following format: global/images/my-private-image You can also specify a description:
private image by its image family, which returns the latest version of the image - A reference to the zone where the disk resides.
in that family. Replace the image name with family/family-name: global/images/family/my-private-family returned: success
.' type: str
returned: success source_image_encryption_key:
type: str description:
zone: - The customer-supplied encryption key of the source image. Required if the source
description: image is protected by a customer-supplied encryption key.
- A reference to the zone where the disk resides. returned: success
returned: success type: complex
type: str contains:
sourceImageEncryptionKey: raw_key:
description: description:
- The customer-supplied encryption key of the source image. Required if the source - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 base64
image is protected by a customer-supplied encryption key. to either encrypt or decrypt this resource.
returned: success returned: success
type: complex type: str
contains: sha256:
rawKey: description:
description: - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption key
- Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 that protects this resource.
base64 to either encrypt or decrypt this resource. returned: success
returned: success type: str
type: str source_image_id:
sha256: description:
description: - The ID value of the image used to create this disk. This value identifies the exact
- The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption image that was used to create this persistent disk. For example, if you created
key that protects this resource. the persistent disk from an image that was later deleted and recreated under the
returned: success same name, the source image ID would identify the exact version of the image that
type: str was used.
kmsKeyName: returned: success
description: type: str
- The name of the encryption key that is stored in Google Cloud KMS. disk_encryption_key:
returned: success description:
type: str - Encrypts the disk using a customer-supplied encryption key.
sourceImageId: - After you encrypt a disk with a customer-supplied key, you must provide the same
description: key if you use the disk later (e.g. to create a disk snapshot or an image, or to
- The ID value of the image used to create this disk. This value identifies the attach the disk to a virtual machine).
exact image that was used to create this persistent disk. For example, if you - Customer-supplied encryption keys do not protect access to metadata of the disk.
created the persistent disk from an image that was later deleted and recreated - If you do not provide an encryption key when creating the disk, then the disk will
under the same name, the source image ID would identify the exact version of the be encrypted using an automatically generated key and you do not need to provide
image that was used. a key to use the disk later.
returned: success returned: success
type: str type: complex
diskEncryptionKey: contains:
description: raw_key:
- Encrypts the disk using a customer-supplied encryption key. description:
- After you encrypt a disk with a customer-supplied key, you must provide the same - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 base64
key if you use the disk later (e.g. to create a disk snapshot or an image, or to either encrypt or decrypt this resource.
to attach the disk to a virtual machine). returned: success
- Customer-supplied encryption keys do not protect access to metadata of the disk. type: str
- If you do not provide an encryption key when creating the disk, then the disk sha256:
will be encrypted using an automatically generated key and you do not need to description:
provide a key to use the disk later. - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption key
returned: success that protects this resource.
type: complex returned: success
contains: type: str
rawKey: source_snapshot:
description: description:
- Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 - 'The source snapshot used to create this disk. You can provide this as a partial or
base64 to either encrypt or decrypt this resource. full URL to the resource. For example, the following are valid values: *
returned: success `U(https://www.googleapis.com/compute/v1/projects/project/global/snapshots/snapshot`)
type: str * `projects/project/global/snapshots/snapshot` * `global/snapshots/snapshot` .'
sha256: returned: success
description: type: dict
- The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption source_snapshot_encryption_key:
key that protects this resource. description:
returned: success - The customer-supplied encryption key of the source snapshot. Required if the source
type: str snapshot is protected by a customer-supplied encryption key.
kmsKeyName: returned: success
description: type: complex
- The name of the encryption key that is stored in Google Cloud KMS. contains:
returned: success raw_key:
type: str description:
sourceSnapshot: - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 base64
description: to either encrypt or decrypt this resource.
- The source snapshot used to create this disk. You can provide this as a partial returned: success
or full URL to the resource. type: str
returned: success sha256:
type: str description:
sourceSnapshotEncryptionKey: - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption key
description: that protects this resource.
- The customer-supplied encryption key of the source snapshot. Required if the source returned: success
snapshot is protected by a customer-supplied encryption key. type: str
returned: success source_snapshot_id:
type: complex description:
contains: - The unique ID of the snapshot used to create this disk. This value identifies the
rawKey: exact snapshot that was used to create this persistent disk. For example, if you
description: created the persistent disk from a snapshot that was later deleted and recreated
- Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 under the same name, the source snapshot ID would identify the exact version of
base64 to either encrypt or decrypt this resource. the snapshot that was used.
returned: success returned: success
type: str type: str
kmsKeyName:
description:
- The name of the encryption key that is stored in Google Cloud KMS.
returned: success
type: str
sha256:
description:
- The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption
key that protects this resource.
returned: success
type: str
sourceSnapshotId:
description:
- The unique ID of the snapshot used to create this disk. This value identifies
the exact snapshot that was used to create this persistent disk. For example,
if you created the persistent disk from a snapshot that was later deleted and
recreated under the same name, the source snapshot ID would identify the exact
version of the snapshot that was used.
returned: success
type: str
''' '''
################################################################################ ################################################################################
@ -432,13 +407,14 @@ def main():
licenses=dict(type='list', elements='str'), licenses=dict(type='list', elements='str'),
name=dict(required=True, type='str'), name=dict(required=True, type='str'),
size_gb=dict(type='int'), size_gb=dict(type='int'),
physical_block_size_bytes=dict(type='int'),
type=dict(type='str'), type=dict(type='str'),
source_image=dict(type='str'), source_image=dict(type='str'),
zone=dict(required=True, type='str'), zone=dict(required=True, type='str'),
source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), sha256=dict(type='str'), kms_key_name=dict(type='str'))), source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))),
disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), sha256=dict(type='str'), kms_key_name=dict(type='str'))), disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))),
source_snapshot=dict(), source_snapshot=dict(type='dict'),
source_snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'), sha256=dict(type='str'))), source_snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))),
) )
) )
@ -522,6 +498,7 @@ def resource_to_request(module):
u'licenses': module.params.get('licenses'), u'licenses': module.params.get('licenses'),
u'name': module.params.get('name'), u'name': module.params.get('name'),
u'sizeGb': module.params.get('size_gb'), u'sizeGb': module.params.get('size_gb'),
u'physicalBlockSizeBytes': module.params.get('physical_block_size_bytes'),
u'type': disk_type_selflink(module.params.get('type'), module.params), u'type': disk_type_selflink(module.params.get('type'), module.params),
u'sourceImage': module.params.get('source_image'), u'sourceImage': module.params.get('source_image'),
} }
@ -601,7 +578,7 @@ def response_to_hash(module, response):
u'sizeGb': response.get(u'sizeGb'), u'sizeGb': response.get(u'sizeGb'),
u'users': response.get(u'users'), u'users': response.get(u'users'),
u'type': response.get(u'type'), u'type': response.get(u'type'),
u'sourceImage': module.params.get('source_image'), u'sourceImage': module.params.get('source_image')
} }
@ -658,14 +635,10 @@ class DiskSourceimageencryptionkey(object):
self.request = {} self.request = {}
def to_request(self): def to_request(self):
return remove_nones_from_dict( return remove_nones_from_dict({u'rawKey': self.request.get('raw_key'), u'kmsKeyName': self.request.get('kms_key_name')})
{u'rawKey': self.request.get('raw_key'), u'sha256': self.request.get('sha256'), u'kmsKeyName': self.request.get('kms_key_name')}
)
def from_response(self): def from_response(self):
return remove_nones_from_dict( return remove_nones_from_dict({u'rawKey': self.request.get(u'rawKey'), u'kmsKeyName': self.request.get(u'kmsKeyName')})
{u'rawKey': self.request.get(u'rawKey'), u'sha256': self.request.get(u'sha256'), u'kmsKeyName': self.request.get(u'kmsKeyName')}
)
class DiskDiskencryptionkey(object): class DiskDiskencryptionkey(object):
@ -677,14 +650,10 @@ class DiskDiskencryptionkey(object):
self.request = {} self.request = {}
def to_request(self): def to_request(self):
return remove_nones_from_dict( return remove_nones_from_dict({u'rawKey': self.request.get('raw_key'), u'kmsKeyName': self.request.get('kms_key_name')})
{u'rawKey': self.request.get('raw_key'), u'sha256': self.request.get('sha256'), u'kmsKeyName': self.request.get('kms_key_name')}
)
def from_response(self): def from_response(self):
return remove_nones_from_dict( return remove_nones_from_dict({u'rawKey': self.request.get(u'rawKey'), u'kmsKeyName': self.request.get(u'kmsKeyName')})
{u'rawKey': self.request.get(u'rawKey'), u'sha256': self.request.get(u'sha256'), u'kmsKeyName': self.request.get(u'kmsKeyName')}
)
class DiskSourcesnapshotencryptionkey(object): class DiskSourcesnapshotencryptionkey(object):
@ -696,14 +665,10 @@ class DiskSourcesnapshotencryptionkey(object):
self.request = {} self.request = {}
def to_request(self): def to_request(self):
return remove_nones_from_dict( return remove_nones_from_dict({u'rawKey': self.request.get('raw_key'), u'kmsKeyName': self.request.get('kms_key_name')})
{u'rawKey': self.request.get('raw_key'), u'kmsKeyName': self.request.get('kms_key_name'), u'sha256': self.request.get('sha256')}
)
def from_response(self): def from_response(self):
return remove_nones_from_dict( return remove_nones_from_dict({u'rawKey': self.request.get(u'rawKey'), u'kmsKeyName': self.request.get(u'kmsKeyName')})
{u'rawKey': self.request.get(u'rawKey'), u'kmsKeyName': self.request.get(u'kmsKeyName'), u'sha256': self.request.get(u'sha256')}
)
if __name__ == '__main__': if __name__ == '__main__':