From 552e682c372db53422f47f41a4664bb11af22e3c Mon Sep 17 00:00:00 2001
From: Dana Hoffman <danahoffman@google.com>
Date: Thu, 16 Aug 2018 18:18:40 +0000
Subject: [PATCH] add RegionDiskType

---
 .../modules/cloud/google/gcp_compute_disk.py       | 14 +++++++-------
 .../modules/cloud/google/gcp_compute_disk_facts.py | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/ansible/modules/cloud/google/gcp_compute_disk.py b/lib/ansible/modules/cloud/google/gcp_compute_disk.py
index 8dfc0d1ed1be9e..31fac0a5d9e481 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_disk.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_disk.py
@@ -248,18 +248,18 @@
               sizeGb must not be less than the size of the sourceImage or the size of the snapshot.
         returned: success
         type: int
-    type:
-        description:
-            - URL of the disk type resource describing which disk type to use to create the disk.
-              Provide this when creating the disk.
-        returned: success
-        type: str
     users:
         description:
             - 'Links to the users of the disk (attached instances) in form: project/zones/zone/instances/instance
               .'
         returned: success
         type: list
+    type:
+        description:
+            - URL of the disk type resource describing which disk type to use to create the disk.
+              Provide this when creating the disk.
+        returned: success
+        type: str
     source_image:
         description:
             - The source image used to create this disk. If the source image is deleted, this
@@ -548,8 +548,8 @@ def response_to_hash(module, response):
         u'licenses': response.get(u'licenses'),
         u'name': module.params.get('name'),
         u'sizeGb': response.get(u'sizeGb'),
-        u'type': response.get(u'type'),
         u'users': response.get(u'users'),
+        u'type': response.get(u'type'),
         u'sourceImage': module.params.get('source_image')
     }
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_disk_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_disk_facts.py
index 56929a911f4e6e..13f01c8d88f375 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_disk_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_disk_facts.py
@@ -126,18 +126,18 @@
                   sizeGb must not be less than the size of the sourceImage or the size of the snapshot.
             returned: success
             type: int
-        type:
-            description:
-                - URL of the disk type resource describing which disk type to use to create the disk.
-                  Provide this when creating the disk.
-            returned: success
-            type: str
         users:
             description:
                 - 'Links to the users of the disk (attached instances) in form: project/zones/zone/instances/instance
                   .'
             returned: success
             type: list
+        type:
+            description:
+                - URL of the disk type resource describing which disk type to use to create the disk.
+                  Provide this when creating the disk.
+            returned: success
+            type: str
         source_image:
             description:
                 - The source image used to create this disk. If the source image is deleted, this