[2.8] Fix return value documentation (1/2) (#63517)

* Fix return value documentation (1/2) (#63477)
* Avoid validation errors for missing 'contains:'.

(cherry picked from commit 6bea1597cc55345584ae773d40e4f5418081ff58)

* Add validate-modules/ignore.txt entries.

28 files changed, 113 insertions, 104 deletions

diff --git a/lib/ansible/modules/cloud/amazon/aws_kms.py b/lib/ansible/modules/cloud/amazon/aws_kms.py
index e464a794a5..e12a9005fb 100644
--- a/lib/ansible/modules/cloud/amazon/aws_kms.py
+++ b/lib/ansible/modules/cloud/amazon/aws_kms.py
@@ -277,7 +277,7 @@ grants:
       description: Date of creation of the grant
       type: str
       returned: always
-      sample: 2017-04-18T15:12:08+10:00
+      sample: "2017-04-18T15:12:08+10:00"
     grant_id:
       description: The unique ID for the grant
       type: str
diff --git a/lib/ansible/modules/cloud/amazon/aws_kms_facts.py b/lib/ansible/modules/cloud/amazon/aws_kms_facts.py
index aa34ac3777..68c0426d66 100644
--- a/lib/ansible/modules/cloud/amazon/aws_kms_facts.py
+++ b/lib/ansible/modules/cloud/amazon/aws_kms_facts.py
@@ -102,7 +102,7 @@ keys:
       description: Date of creation of the key
       type: str
       returned: always
-      sample: 2017-04-18T15:12:08.551000+10:00
+      sample: "2017-04-18T15:12:08.551000+10:00"
     description:
       description: Description of the key
       type: str
@@ -178,7 +178,7 @@ keys:
           description: Date of creation of the grant
           type: str
           returned: always
-          sample: 2017-04-18T15:12:08+10:00
+          sample: "2017-04-18T15:12:08+10:00"
         grant_id:
           description: The unique ID for the grant
           type: str
diff --git a/lib/ansible/modules/cloud/amazon/aws_secret.py b/lib/ansible/modules/cloud/amazon/aws_secret.py
index a7976a6c1d..96da5c5682 100644
--- a/lib/ansible/modules/cloud/amazon/aws_secret.py
+++ b/lib/ansible/modules/cloud/amazon/aws_secret.py
@@ -94,22 +94,22 @@ secret:
     arn:
       description: The ARN of the secret
       returned: always
-      type: string
+      type: str
       sample: arn:aws:secretsmanager:eu-west-1:xxxxxxxxxx:secret:xxxxxxxxxxx
     last_accessed_date:
       description: The date the secret was last accessed
       returned: always
-      type: string
+      type: str
       sample: '2018-11-20T01:00:00+01:00'
     last_changed_date:
       description: The date the secret was last modified.
       returned: always
-      type: string
+      type: str
       sample: '2018-11-20T12:16:38.433000+01:00'
     name:
       description: The secret name.
       returned: always
-      type: string
+      type: str
       sample: my_secret
     rotation_enabled:
       description: The secret rotation status.
diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_vpn_facts.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_vpn_facts.py
index 1f9512fd86..5881dc28ba 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_vpc_vpn_facts.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_vpn_facts.py
@@ -119,26 +119,26 @@ vpn_connections:
              returned: always
              type: int
              sample: 0
-         last_status_change:
-             description: The date and time of the last change in status.
-             returned: always
-             type: datetime
-             sample: 2018-02-09T14:35:27+00:00
-         outside_ip_address:
-             description: The Internet-routable IP address of the virtual private gateway's outside interface.
-             returned: always
-             type: str
-             sample: 13.127.79.191
-         status:
-             description: The status of the VPN tunnel.
-             returned: always
-             type: str
-             sample: DOWN
-         status_message:
-             description: If an error occurs, a description of the error.
-             returned: always
-             type: str
-             sample: IPSEC IS DOWN
+           last_status_change:
+               description: The date and time of the last change in status.
+               returned: always
+               type: datetime
+               sample: "2018-02-09T14:35:27+00:00"
+           outside_ip_address:
+               description: The Internet-routable IP address of the virtual private gateway's outside interface.
+               returned: always
+               type: str
+               sample: 13.127.79.191
+           status:
+               description: The status of the VPN tunnel.
+               returned: always
+               type: str
+               sample: DOWN
+           status_message:
+               description: If an error occurs, a description of the error.
+               returned: always
+               type: str
+               sample: IPSEC IS DOWN
       vpn_connection_id:
         description: The ID of the VPN connection.
         returned: always
diff --git a/lib/ansible/modules/cloud/amazon/elb_target_group_facts.py b/lib/ansible/modules/cloud/amazon/elb_target_group_facts.py
index 46dcae438d..1658eb383f 100644
--- a/lib/ansible/modules/cloud/amazon/elb_target_group_facts.py
+++ b/lib/ansible/modules/cloud/amazon/elb_target_group_facts.py
@@ -161,7 +161,7 @@ target_groups:
                 health_check_port:
                     description: The port to check target health.
                     returned: always
-                    type: string
+                    type: str
                     sample: '80'
                 target:
                     description: The target metadata.
@@ -171,7 +171,7 @@ target_groups:
                         id:
                             description: The ID of the target.
                             returned: always
-                            type: string
+                            type: str
                             sample: i-0123456789
                         port:
                             description: The port to use to connect with the target.
@@ -186,7 +186,7 @@ target_groups:
                         state:
                             description: The state of the target health.
                             returned: always
-                            type: string
+                            type: str
                             sample: healthy
         target_group_name:
             description: The name of the target group.
diff --git a/lib/ansible/modules/cloud/amazon/rds.py b/lib/ansible/modules/cloud/amazon/rds.py
index bfac2b0d46..abe648f44c 100644
--- a/lib/ansible/modules/cloud/amazon/rds.py
+++ b/lib/ansible/modules/cloud/amazon/rds.py
@@ -267,67 +267,67 @@ instance:
         engine:
             description: the name of the database engine
             returned: when RDS instance exists
-            type: string
+            type: str
             sample: "oracle-se"
         engine_version:
             description: the version of the database engine
             returned: when RDS instance exists
-            type: string
+            type: str
             sample: "11.2.0.4.v6"
         license_model:
             description: the license model information
             returned: when RDS instance exists
-            type: string
+            type: str
             sample: "bring-your-own-license"
         character_set_name:
             description: the name of the character set that this instance is associated with
             returned: when RDS instance exists
-            type: string
+            type: str
             sample: "AL32UTF8"
         allocated_storage:
             description: the allocated storage size in gigabytes (GB)
             returned: when RDS instance exists
-            type: string
+            type: str
             sample: "100"
         publicly_accessible:
             description: the accessibility options for the DB instance
             returned: when RDS instance exists
-            type: boolean
+            type: bool
             sample: "true"
         latest_restorable_time:
             description: the latest time to which a database can be restored with point-in-time restore
             returned: when RDS instance exists
-            type: string
+            type: str
             sample: "1489707802.0"
         secondary_availability_zone:
             description: the name of the secondary AZ for a DB instance with multi-AZ support
             returned: when RDS instance exists and is multy-AZ
-            type: string
+            type: str
             sample: "eu-west-1b"
         backup_window:
             description: the daily time range during which automated backups are created if automated backups are enabled
             returned: when RDS instance exists and automated backups are enabled
-            type: string
+            type: str
             sample: "03:00-03:30"
         auto_minor_version_upgrade:
             description: indicates that minor engine upgrades will be applied automatically to the DB instance during the maintenance window
             returned: when RDS instance exists
-            type: boolean
+            type: bool
             sample: "true"
         read_replica_source_dbinstance_identifier:
             description: the identifier of the source DB instance if this RDS instance is a read replica
             returned: when read replica RDS instance exists
-            type: string
+            type: str
             sample: "null"
         db_name:
             description: the name of the database to create when the DB instance is created
             returned: when RDS instance exists
-            type: string
+            type: str
             sample: "ASERTG"
         endpoint:
             description: the endpoint uri of the database instance
             returned: when RDS instance exists
-            type: string
+            type: str
             sample: "my-ansible-database.asdfaosdgih.us-east-1.rds.amazonaws.com"
         port:
             description: the listening port of the database instance
@@ -342,12 +342,12 @@ instance:
                 parameter_apply_status:
                     description: the status of parameter updates
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "in-sync"
                 parameter_group_name:
                     description: the name of the DP parameter group
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "testawsrpprodb01spfile-1ujg7nrs7sgyz"
         option_groups:
             description: the list of option group memberships for this RDS instance
@@ -357,12 +357,12 @@ instance:
                 option_group_name:
                     description: the option group name for this RDS instance
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "default:oracle-se-11-2"
                 status:
                     description: the status of the RDS instance's option group membership
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "in-sync"
         pending_modified_values:
             description: a dictionary of changes to the RDS instance that are pending
@@ -372,47 +372,47 @@ instance:
                 db_instance_class:
                     description: the new DB instance class for this RDS instance that will be applied or is in progress
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "null"
                 db_instance_identifier:
                     description: the new DB instance identifier this RDS instance that will be applied or is in progress
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "null"
                 allocated_storage:
                     description: the new allocated storage size for this RDS instance that will be applied or is in progress
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "null"
                 backup_retention_period:
                     description: the pending number of days for which automated backups are retained
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "null"
                 engine_version:
                     description: indicates the database engine version
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "null"
                 iops:
                     description: the new provisioned IOPS value for this RDS instance that will be applied or is being applied
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "null"
                 master_user_password:
                     description: the pending or in-progress change of the master credentials for this RDS instance
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "null"
                 multi_az:
                     description: indicates that the single-AZ RDS instance is to change to a multi-AZ deployment
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "null"
                 port:
                     description: specifies the pending port for this RDS instance
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "null"
         db_subnet_groups:
             description: information on the subnet group associated with this RDS instance
@@ -422,17 +422,17 @@ instance:
                 description:
                     description: the subnet group associated with the DB instance
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "Subnets for the UAT RDS SQL DB Instance"
                 name:
                     description: the name of the DB subnet group
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "samplesubnetgrouprds-j6paiqkxqp4z"
                 status:
                     description: the status of the DB subnet group
                     returned: when RDS instance exists
-                    type: string
+                    type: str
                     sample: "complete"
                 subnets:
                     description: the description of the DB subnet group
@@ -447,22 +447,22 @@ instance:
                                 name:
                                     description: availability zone
                                     returned: when RDS instance exists
-                                    type: string
+                                    type: str
                                     sample: "eu-west-1b"
                                 provisioned_iops_capable:
                                     description: whether provisioned iops are available in AZ subnet
                                     returned: when RDS instance exists
-                                    type: boolean
+                                    type: bool
                                     sample: "false"
                         identifier:
                             description: the identifier of the subnet
                             returned: when RDS instance exists
-                            type: string
+                            type: str
                             sample: "subnet-3fdba63e"
                         status:
                             description: the status of the subnet
                             returned: when RDS instance exists
-                            type: string
+                            type: str
                             sample: "active"
 '''
 
diff --git a/lib/ansible/modules/cloud/amazon/rds_subnet_group.py b/lib/ansible/modules/cloud/amazon/rds_subnet_group.py
index 0aa95a7a45..68dccdaaf4 100644
--- a/lib/ansible/modules/cloud/amazon/rds_subnet_group.py
+++ b/lib/ansible/modules/cloud/amazon/rds_subnet_group.py
@@ -78,7 +78,7 @@ subnet_group:
         subnet_ids:
             description: Contains a list of Subnet IDs
             returned: I(state=present)
-            type: array
+            type: list
         status:
             description: The status of the DB subnet group
             returned: I(state=present)
diff --git a/lib/ansible/modules/cloud/amazon/redshift.py b/lib/ansible/modules/cloud/amazon/redshift.py
index 34adf2131c..ea902c2e49 100644
--- a/lib/ansible/modules/cloud/amazon/redshift.py
+++ b/lib/ansible/modules/cloud/amazon/redshift.py
@@ -214,7 +214,7 @@ cluster:
         enhanced_vpc_routing:
             description: status of the enhanced vpc routing feature.
             returned: success
-            type: boolean
+            type: bool
 '''
 
 try:
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_containerregistry_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_containerregistry_facts.py
index 7b0516368a..58eb7377f2 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_containerregistry_facts.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_containerregistry_facts.py
@@ -109,7 +109,7 @@ registries:
         credentials:
             description:
                 - Credentials, fields will be empty if admin user is not enabled for ACR
-            return: when C(retrieve_credentials) is set and C(admin_user_enabled) is set on ACR
+            returned: when C(retrieve_credentials) is set and C(admin_user_enabled) is set on ACR
             type: complex
             contains:
                 username:
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualmachine_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualmachine_facts.py
index 450ff459f6..f562896839 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualmachine_facts.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualmachine_facts.py
@@ -101,7 +101,7 @@ virtualmachines:
                 - Virtual machine expiration date.
             returned: always
             type: str
-            sample: 2029-02-22T01:49:12.117974Z
+            sample: "2029-02-22T01:49:12.117974Z"
         image:
             description:
                 - Gallery image reference.
@@ -197,7 +197,7 @@ virtualmachines:
                 - Tags
             returned: always
             type: complex
-            sample: { 'foo': 'bar' }
+            sample: "{ 'foo': 'bar' }"
 '''
 
 from ansible.module_utils.azure_rm_common import AzureRMModuleBase
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_hdinsightcluster_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_hdinsightcluster_facts.py
index a5f9928ce0..0bca1bfde1 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_hdinsightcluster_facts.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_hdinsightcluster_facts.py
@@ -113,7 +113,7 @@ clusters:
             description:
                 - The list of roles in the cluster.
             type: list
-            suboptions:
+            contains:
                 name:
                     description:
                         - The name of the role.
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_roleassignment_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_roleassignment_facts.py
index a25407f2ac..90af5bf4ed 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_roleassignment_facts.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_roleassignment_facts.py
@@ -77,7 +77,7 @@ roleassignments:
             returned: always
             sample: myRoleAssignment
         type:
-            descripition:
+            description:
                 - Type of role assignment.
             type: str
             returned: always
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_subnet_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_subnet_facts.py
index 30927847c1..11b2890e9f 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_subnet_facts.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_subnet_facts.py
@@ -115,7 +115,6 @@ subnets:
                 service:
                     description:
                         - The type of the endpoint service.
-                    required: True
                 locations:
                     description:
                         - A list of location names.
diff --git a/lib/ansible/modules/cloud/hcloud/hcloud_ssh_key.py b/lib/ansible/modules/cloud/hcloud/hcloud_ssh_key.py
index 91ba321e69..5648b95eb6 100644
--- a/lib/ansible/modules/cloud/hcloud/hcloud_ssh_key.py
+++ b/lib/ansible/modules/cloud/hcloud/hcloud_ssh_key.py
@@ -97,17 +97,17 @@ hcloud_ssh_key:
             sample: 12345
         name:
             description: Name of the ssh_key
-            type: string
+            type: str
             returned: Always
             sample: my-ssh-key
         fingerprint:
             description: Fingerprint of the ssh_key
-            type: string
+            type: str
             returned: Always
             sample: b7:2f:30:a0:2f:6c:58:6c:21:04:58:61:ba:06:3b:2f
         public_key:
             description: Public key of the ssh_key
-            type: string
+            type: str
             returned: Always
             sample: "ssh-rsa AAAjjk76kgf...Xt"
         labels:
diff --git a/lib/ansible/modules/cloud/hcloud/hcloud_volume.py b/lib/ansible/modules/cloud/hcloud/hcloud_volume.py
index 5426c8cee0..a612d8a40c 100644
--- a/lib/ansible/modules/cloud/hcloud/hcloud_volume.py
+++ b/lib/ansible/modules/cloud/hcloud/hcloud_volume.py
@@ -122,7 +122,7 @@ hcloud_volume:
             sample: 12345
         name:
             description: Name of the volume
-            type: string
+            type: str
             returned: Always
             sample: my-volume
         size:
@@ -132,7 +132,7 @@ hcloud_volume:
             sample: 1337
         location:
             description: Location name where the volume is located at
-            type: string
+            type: str
             returned: Always
             sample: "fsn1"
         labels:
@@ -144,7 +144,7 @@ hcloud_volume:
                 mylabel: 123
         server:
             description: Server name where the volume is attached to
-            type: string
+            type: str
             returned: Always
             sample: "my-server"
 """
diff --git a/lib/ansible/modules/cloud/online/online_server_facts.py b/lib/ansible/modules/cloud/online/online_server_facts.py
index bf2182339b..3b77a99a57 100644
--- a/lib/ansible/modules/cloud/online/online_server_facts.py
+++ b/lib/ansible/modules/cloud/online/online_server_facts.py
@@ -36,7 +36,7 @@ online_server_facts:
   description: Response from Online API
   returned: success
   type: complex
-  contains:
+  sample:
     "online_server_facts": [
         {
             "abuse": "abuse@example.com",
diff --git a/lib/ansible/modules/cloud/online/online_user_facts.py b/lib/ansible/modules/cloud/online/online_user_facts.py
index 3a289414f0..4c7cfb2cc3 100644
--- a/lib/ansible/modules/cloud/online/online_user_facts.py
+++ b/lib/ansible/modules/cloud/online/online_user_facts.py
@@ -33,7 +33,7 @@ online_user_facts:
   description: Response from Online API
   returned: success
   type: complex
-  contains:
+  sample:
     "online_user_facts": {
         "company": "foobar LLC",
         "email": "foobar@example.com",
diff --git a/lib/ansible/modules/cloud/openstack/os_coe_cluster.py b/lib/ansible/modules/cloud/openstack/os_coe_cluster.py
index bd3fedea07..ad53bb5aad 100644
--- a/lib/ansible/modules/cloud/openstack/os_coe_cluster.py
+++ b/lib/ansible/modules/cloud/openstack/os_coe_cluster.py
@@ -86,27 +86,27 @@ cluster:
       api_address:
           description:
             - Api address of cluster master node
-          type: string
+          type: str
           sample: https://172.24.4.30:6443
       cluster_template_id:
           description: The cluster_template UUID
-          type: string
+          type: str
           sample: '7b1418c8-cea8-48fc-995d-52b66af9a9aa'
       coe_version:
           description:
             - Version of the COE software currently running in this cluster
-          type: string
+          type: str
           sample: v1.11.1
       container_version:
           description:
-            - Version of the container software. Example: docker version.
-          type: string
+            - "Version of the container software. Example: docker version."
+          type: str
           sample: 1.12.6
       created_at:
           description:
             - The time in UTC at which the cluster is created
           type: datetime
-          sample: 2018-08-16T10:29:45+00:00
+          sample: "2018-08-16T10:29:45+00:00"
       create_timeout:
           description:
             - Timeout for creating the cluster in minutes. Default to 60 if
@@ -116,7 +116,7 @@ cluster:
       discovery_url:
           description:
             - Url used for cluster node discovery
-          type: string
+          type: str
           sample: https://discovery.etcd.io/a42ee38e7113f31f4d6324f24367aae5
       faults:
           description:
@@ -126,12 +126,12 @@ cluster:
       flavor_id:
           description:
             - The flavor of the minion node for this cluster
-          type: string
+          type: str
           sample: c1.c1r1
       keypair:
           description:
             - Name of the keypair to use.
-          type: string
+          type: str
           sample: mykey
       labels:
           description: One or more key/value pairs
@@ -150,12 +150,12 @@ cluster:
       master_flavor_id:
           description:
             - The flavor of the master node for this cluster
-          type: string
+          type: str
           sample: c1.c1r1
       name:
           description:
             - Name that has to be given to the cluster
-          type: string
+          type: str
           sample: k8scluster
       node_addresses:
           description:
@@ -170,26 +170,26 @@ cluster:
       stack_id:
           description:
             - Stack id of the Heat stack
-          type: string
+          type: str
           sample: '07767ec6-85f5-44cb-bd63-242a8e7f0d9d'
       status:
           description: Status of the cluster from the heat stack
-          type: string
+          type: str
           sample: 'CREATE_COMLETE'
       status_reason:
           description:
             - Status reason of the cluster from the heat stack
-          type: string
+          type: str
           sample: 'Stack CREATE completed successfully'
       updated_at:
           description:
             - The time in UTC at which the cluster is updated
-          type: datetime
+          type: str
           sample: '2018-08-16T10:39:25+00:00'
       uuid:
           description:
             - Unique UUID for this cluster
-          type: string
+          type: str
           sample: '86246a4d-a16c-4a58-9e96ad7719fe0f9d'
 '''
 
diff --git a/lib/ansible/modules/cloud/openstack/os_coe_cluster_template.py b/lib/ansible/modules/cloud/openstack/os_coe_cluster_template.py
index 755b25162c..7975ab598c 100644
--- a/lib/ansible/modules/cloud/openstack/os_coe_cluster_template.py
+++ b/lib/ansible/modules/cloud/openstack/os_coe_cluster_template.py
@@ -177,7 +177,7 @@ cluster_template:
           description:
             - Indicates whether created clusters should have a floating ip or not
           type: bool
-          default: true
+          sample: true
       keypair_id:
           description:
             - Name or ID of the keypair to use.
diff --git a/lib/ansible/modules/cloud/openstack/os_quota.py b/lib/ansible/modules/cloud/openstack/os_quota.py
index 13cde37d84..5cf40040ec 100644
--- a/lib/ansible/modules/cloud/openstack/os_quota.py
+++ b/lib/ansible/modules/cloud/openstack/os_quota.py
@@ -180,7 +180,7 @@ openstack_quotas:
     description: Dictionary describing the project quota.
     returned: Regardless if changes where made or not
     type: complex
-    contains:
+    sample:
         openstack_quotas: {
             compute: {
                 cores: 150,
diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_image_facts.py b/lib/ansible/modules/cloud/scaleway/scaleway_image_facts.py
index 0becfdbd86..dfcf6a9768 100644
--- a/lib/ansible/modules/cloud/scaleway/scaleway_image_facts.py
+++ b/lib/ansible/modules/cloud/scaleway/scaleway_image_facts.py
@@ -49,7 +49,7 @@ scaleway_image_facts:
   description: Response from Scaleway API
   returned: success
   type: complex
-  contains:
+  sample:
     "scaleway_image_facts": [
         {
            "arch": "x86_64",
diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_ip_facts.py b/lib/ansible/modules/cloud/scaleway/scaleway_ip_facts.py
index cf0c3916c1..3bbbc2ec20 100644
--- a/lib/ansible/modules/cloud/scaleway/scaleway_ip_facts.py
+++ b/lib/ansible/modules/cloud/scaleway/scaleway_ip_facts.py
@@ -47,7 +47,7 @@ scaleway_ip_facts:
   description: Response from Scaleway API
   returned: success
   type: complex
-  contains:
+  sample:
     "scaleway_ip_facts": [
         {
             "address": "163.172.170.243",
diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_organization_facts.py b/lib/ansible/modules/cloud/scaleway/scaleway_organization_facts.py
index b87a38b385..f5d0a6bb11 100644
--- a/lib/ansible/modules/cloud/scaleway/scaleway_organization_facts.py
+++ b/lib/ansible/modules/cloud/scaleway/scaleway_organization_facts.py
@@ -41,7 +41,7 @@ scaleway_organization_facts:
   description: Response from Scaleway API
   returned: success
   type: complex
-  contains:
+  sample:
     "scaleway_organization_facts": [
         {
             "address_city_name": "Paris",
diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_security_group_facts.py b/lib/ansible/modules/cloud/scaleway/scaleway_security_group_facts.py
index 524343647b..a2ce980a46 100644
--- a/lib/ansible/modules/cloud/scaleway/scaleway_security_group_facts.py
+++ b/lib/ansible/modules/cloud/scaleway/scaleway_security_group_facts.py
@@ -47,7 +47,7 @@ scaleway_security_group_facts:
   description: Response from Scaleway API
   returned: success
   type: complex
-  contains:
+  sample:
     "scaleway_security_group_facts": [
         {
             "description": "test-ams",
diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_server_facts.py b/lib/ansible/modules/cloud/scaleway/scaleway_server_facts.py
index 34cb4a9432..1fbe31a9b6 100644
--- a/lib/ansible/modules/cloud/scaleway/scaleway_server_facts.py
+++ b/lib/ansible/modules/cloud/scaleway/scaleway_server_facts.py
@@ -47,7 +47,7 @@ scaleway_server_facts:
   description: Response from Scaleway API
   returned: success
   type: complex
-  contains:
+  sample:
     "scaleway_server_facts": [
         {
             "arch": "x86_64",
diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_snapshot_facts.py b/lib/ansible/modules/cloud/scaleway/scaleway_snapshot_facts.py
index 81449ad94c..53cc791fd5 100644
--- a/lib/ansible/modules/cloud/scaleway/scaleway_snapshot_facts.py
+++ b/lib/ansible/modules/cloud/scaleway/scaleway_snapshot_facts.py
@@ -47,7 +47,7 @@ scaleway_snapshot_facts:
   description: Response from Scaleway API
   returned: success
   type: complex
-  contains:
+  sample:
     "scaleway_snapshot_facts": [
       {
           "base_volume": {
diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_volume_facts.py b/lib/ansible/modules/cloud/scaleway/scaleway_volume_facts.py
index ccf7f52767..e7ce90f13c 100644
--- a/lib/ansible/modules/cloud/scaleway/scaleway_volume_facts.py
+++ b/lib/ansible/modules/cloud/scaleway/scaleway_volume_facts.py
@@ -47,7 +47,7 @@ scaleway_volume_facts:
   description: Response from Scaleway API
   returned: success
   type: complex
-  contains:
+  sample:
     "scaleway_volume_facts": [
         {
             "creation_date": "2018-08-14T20:56:24.949660+00:00",
diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt
index a3d7fd2c6f..bfb7326e1b 100644
--- a/test/sanity/validate-modules/ignore.txt
+++ b/test/sanity/validate-modules/ignore.txt
@@ -161,6 +161,8 @@ lib/ansible/modules/cloud/oneandone/oneandone_private_network.py E326
 lib/ansible/modules/cloud/oneandone/oneandone_public_ip.py E324
 lib/ansible/modules/cloud/oneandone/oneandone_public_ip.py E326
 lib/ansible/modules/cloud/oneandone/oneandone_server.py E326
+lib/ansible/modules/cloud/online/online_server_facts.py E319
+lib/ansible/modules/cloud/online/online_user_facts.py E319
 lib/ansible/modules/cloud/openstack/os_flavor_facts.py E324
 lib/ansible/modules/cloud/openstack/os_flavor_facts.py E335
 lib/ansible/modules/cloud/openstack/os_image.py E324
@@ -174,6 +176,7 @@ lib/ansible/modules/cloud/openstack/os_ironic_node.py E326
 lib/ansible/modules/cloud/openstack/os_ironic_node.py E335
 lib/ansible/modules/cloud/openstack/os_keystone_endpoint.py E322
 lib/ansible/modules/cloud/openstack/os_keystone_endpoint.py E326
+lib/ansible/modules/cloud/openstack/os_quota.py E319
 lib/ansible/modules/cloud/openstack/os_quota.py E322
 lib/ansible/modules/cloud/openstack/os_quota.py E323
 lib/ansible/modules/cloud/openstack/os_quota.py E326
@@ -281,6 +284,13 @@ lib/ansible/modules/cloud/rackspace/rax_network.py E324
 lib/ansible/modules/cloud/rackspace/rax_queue.py E324
 lib/ansible/modules/cloud/rackspace/rax_scaling_group.py E324
 lib/ansible/modules/cloud/rackspace/rax_scaling_policy.py E324
+lib/ansible/modules/cloud/scaleway/scaleway_image_facts.py E319
+lib/ansible/modules/cloud/scaleway/scaleway_ip_facts.py E319
+lib/ansible/modules/cloud/scaleway/scaleway_organization_facts.py E319
+lib/ansible/modules/cloud/scaleway/scaleway_security_group_facts.py E319
+lib/ansible/modules/cloud/scaleway/scaleway_server_facts.py E319
+lib/ansible/modules/cloud/scaleway/scaleway_snapshot_facts.py E319
+lib/ansible/modules/cloud/scaleway/scaleway_volume_facts.py E319
 lib/ansible/modules/cloud/smartos/imgadm.py E317
 lib/ansible/modules/cloud/smartos/vmadm.py E322
 lib/ansible/modules/cloud/smartos/vmadm.py E324