Skip to content

Commit d691b7d

Browse files
committed
Sync bitbucket and GitHub
1 parent 20bb5a5 commit d691b7d

16 files changed

+142
-142
lines changed

plugins/doc_fragments/netapp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ class ModuleDocFragment(object):
3737
- Should https certificates be validated?
3838
type: bool
3939
notes:
40-
- The modules prefixed with na\\_sg are built to manage NetApp StorageGRID.
40+
- The modules prefixed with C(na_sg) are built to manage NetApp StorageGRID.
4141
"""

plugins/modules/na_sg_grid_account.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@
3030
state:
3131
description:
3232
- Whether the specified account should exist or not.
33-
- Required for all operations
33+
- Required for all operations.
3434
type: str
3535
choices: ['present', 'absent']
3636
default: present
3737
name:
3838
description:
3939
- Name of the tenant.
40-
- Required for create or modify operation
40+
- Required for create or modify operation.
4141
type: str
4242
account_id:
4343
description:
4444
- Account Id of the tenant.
45-
- May be used for modify or delete operation
45+
- May be used for modify or delete operation.
4646
type: str
4747
protocol:
4848
description:
4949
- Object Storage protocol used by the tenancy.
50-
- Required for create operation
50+
- Required for create operation.
5151
type: str
5252
choices: ['s3', 'swift']
5353
management:
@@ -66,13 +66,13 @@
6666
root_access_group:
6767
description:
6868
- Existing federated group to have initial Root Access permissions for the tenant.
69-
- Must begin with "federated-group/"
69+
- Must begin with C(federated-group/)
7070
type: str
7171
version_added: 20.11.0
7272
quota_size:
7373
description:
74-
- Quota to apply to the tenant specified in (quota_size_unit).
75-
- If you intend to have no limits, assign 0.
74+
- Quota to apply to the tenant specified in I(quota_size_unit).
75+
- If you intend to have no limits, assign C(0).
7676
type: int
7777
default: 0
7878
quota_size_unit:
@@ -84,7 +84,7 @@
8484
password:
8585
description:
8686
- Root password for tenant account.
87-
- Requires root privilege
87+
- Requires root privilege.
8888
type: str
8989
update_password:
9090
description:

plugins/modules/na_sg_grid_certificate.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@
2727
default: present
2828
type:
2929
description:
30-
- Which certificate to update
30+
- Which certificate to update.
3131
type: str
3232
choices: ['storage-api', 'management']
3333
required: true
3434
server_certificate:
3535
description:
36-
- X.509 server certificate in PEM-encoding
36+
- X.509 server certificate in PEM-encoding.
3737
type: str
3838
ca_bundle:
3939
description:
40-
- Intermediate CA certificate bundle in concatenated PEM-encoding
41-
- Omit if there is no intermediate CA
40+
- Intermediate CA certificate bundle in concatenated PEM-encoding.
41+
- Omit if there is no intermediate CA.
4242
type: str
4343
private_key:
4444
description:
45-
- Certificate private key in PEM-encoding
46-
- Required if C(server_certificate) is specified
45+
- Certificate private key in PEM-encoding.
46+
- Required if I(server_certificate) is specified.
4747
type: str
4848
"""
4949

plugins/modules/na_sg_grid_dns.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
state:
3131
description:
3232
- Whether the specified DNS address should exist or not.
33-
- Required for all operations
33+
- Required for all operations.
3434
type: str
3535
choices: ['present']
3636
default: present

plugins/modules/na_sg_grid_gateway.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,63 +18,63 @@
1818
author: NetApp Ansible Team (@jkandati) <[email protected]>
1919
description:
2020
- Create or Update Load Balancer Endpoints on StorageGRID.
21-
- This module is idempotent if C(private_key) is not specified
21+
- This module is idempotent if I(private_key) is not specified.
2222
options:
2323
state:
2424
description:
25-
- Whether the specified load balancer endpoint should be configured
25+
- Whether the specified load balancer endpoint should be configured.
2626
type: str
2727
choices: ['present', 'absent']
2828
default: present
2929
display_name:
3030
description:
31-
- A display name for the configuration
32-
- This parameter cannot be modified after the load balancer endpoint has been created
31+
- A display name for the configuration.
32+
- This parameter cannot be modified after the load balancer endpoint has been created.
3333
type: str
3434
port:
3535
description:
36-
- The TCP port to serve traffic on
37-
- This parameter cannot be modified after the load balancer endpoint has been created
36+
- The TCP port to serve traffic on.
37+
- This parameter cannot be modified after the load balancer endpoint has been created.
3838
type: int
3939
required: true
4040
secure:
4141
description:
42-
- Whether the load balancer endpoint serves HTTP or HTTPS traffic
43-
- This parameter cannot be modified after the load balancer endpoint has been created
42+
- Whether the load balancer endpoint serves HTTP or HTTPS traffic.
43+
- This parameter cannot be modified after the load balancer endpoint has been created.
4444
type: bool
4545
default: true
4646
enable_ipv4:
4747
description:
48-
- Indicates whether to listen for connections on IPv4
48+
- Indicates whether to listen for connections on IPv4.
4949
type: bool
5050
default: true
5151
enable_ipv6:
5252
description:
53-
- Indicates whether to listen for connections on IPv6
53+
- Indicates whether to listen for connections on IPv6.
5454
type: bool
5555
default: true
5656
default_service_type:
5757
description:
58-
- The type of service to proxy through the load balancer
58+
- The type of service to proxy through the load balancer.
5959
type: str
6060
choices: ["s3","swift"]
6161
default: "s3"
6262
server_certificate:
6363
description:
64-
- X.509 server certificate in PEM-encoding
65-
- Omit if using default certificates
64+
- X.509 server certificate in PEM-encoding.
65+
- Omit if using default certificates.
6666
type: str
6767
required: false
6868
private_key:
6969
description:
70-
- Certficate private key in PEM-encoding
71-
- Required if serverCertificateEncoded is not empty
70+
- Certficate private key in PEM-encoding.
71+
- Required if I(server_certificate) is not empty.
7272
type: str
7373
required: false
7474
ca_bundle:
7575
description:
76-
- Intermediate CA certificate bundle in concatenated PEM-encoding
77-
- Omit when there is no intermediate CA
76+
- Intermediate CA certificate bundle in concatenated PEM-encoding.
77+
- Omit when there is no intermediate CA.
7878
type: str
7979
required: false
8080

plugins/modules/na_sg_grid_group.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
type: str
4141
unique_name:
4242
description:
43-
- Unique Name for the group. Must begin with "group/" or "federated-group/"
44-
- Required for create, modify or delete operation
43+
- Unique Name for the group. Must begin with C(group/) or C(federated-group/)
44+
- Required for create, modify or delete operation.
4545
type: str
4646
required: true
4747
management_policy:

plugins/modules/na_sg_grid_identity_federation.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
author: NetApp Ansible Team (@joshedmonds) <[email protected]>
2020
description:
2121
- Configure Grid Identity Federation within NetApp StorageGRID.
22-
- If module is run with C(check_mode), a connectivity test will be performed using the supplied values without changing the configuration
23-
- This module is idempotent if C(password) is not specified
22+
- If module is run with I(check_mode), a connectivity test will be performed using the supplied values without changing the configuration.
23+
- This module is idempotent if I(password) is not specified.
2424
options:
2525
state:
2626
description:
@@ -60,32 +60,32 @@
6060
type:
6161
description:
6262
- The type of identity source.
63-
- Default is 'ldap'.
63+
- Default is C(ldap).
6464
type: str
6565
default: ldap
6666
ldap_user_id_attribute:
6767
description:
6868
- The LDAP attribute which contains the unique user name of a user.
69-
- Should be configured if C(ldap_service_type) is 'Other'.
69+
- Should be configured if I(ldap_service_type=Other).
7070
type: str
7171
ldap_user_uuid_attribute:
7272
description:
7373
- The LDAP attribute which contains the permanent unique identity of a user.
74-
- Should be configured if C(ldap_service_type) is 'Other'.
74+
- Should be configured if I(ldap_service_type=Other).
7575
type: str
7676
ldap_group_id_attribute:
7777
description:
7878
- The LDAP attribute which contains the group for a user.
79-
- Should be configured if C(ldap_service_type) is 'Other'.
79+
- Should be configured if I(ldap_service_type=Other).
8080
type: str
8181
ldap_group_uuid_attribute:
8282
description:
8383
- The LDAP attribute which contains the group's permanent unique identity.
84-
- Should be configured if C(ldap_service_type) is 'Other'.
84+
- Should be configured if I(ldap_service_type=Other).
8585
type: str
8686
tls:
8787
description:
88-
- Whether Transport Layer Security is used to connect to the LDAP server
88+
- Whether Transport Layer Security is used to connect to the LDAP server.
8989
choices: ['STARTTLS', 'LDAPS', 'Disabled']
9090
type: str
9191
default: STARTTLS

plugins/modules/na_sg_grid_info.py

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -19,72 +19,72 @@
1919
author: NetApp Ansible Team (@jasonl4) <[email protected]>
2020
extends_documentation_fragment:
2121
- netapp.storagegrid.netapp.sg
22-
short_description: NetApp StorageGRID Grid information gatherer
22+
short_description: NetApp StorageGRID Grid information gatherer.
2323
description:
24-
- This module allows you to gather various information about StorageGRID Grid configuration
24+
- This module allows you to gather various information about StorageGRID Grid configuration.
2525
version_added: 20.11.0
2626
2727
options:
2828
gather_subset:
2929
type: list
3030
elements: str
3131
description:
32-
- When supplied, this argument will restrict the information collected
33-
to a given subset. Either the info name or the Rest API can be given.
34-
Possible values for this argument include
35-
'grid_accounts_info' or 'grid/accounts',
36-
'grid_alarms_info' or 'grid/alarms',
37-
'grid_audit_info' or 'grid/audit',
38-
'grid_compliance_global_info' or 'grid/compliance-global',
39-
'grid_config_info' or 'grid/config',
40-
'grid_config_management_info' or 'grid/config/management',
41-
'grid_config_product_version_info' or 'grid/config/product-version',
42-
'grid_deactivated_features_info' or 'grid/deactivated-features',
43-
'grid_dns_servers_info' or 'grid/dns-servers',
44-
'grid_domain_names_info' or 'grid/domain-names',
45-
'grid_ec_profiles_info' or 'grid/ec-profiles',
46-
'grid_expansion_info' or 'grid/expansion',
47-
'grid_expansion_nodes_info' or 'grid/expansion/nodes',
48-
'grid_expansion_sites_info' or 'grid/expansion/sites',
49-
'grid_grid_networks_info' or 'grid/grid-networks',
50-
'grid_groups_info' or 'grid/groups',
51-
'grid_health_info' or 'grid/health',
52-
'grid_health_topology_info' or 'grid/health/topology',
53-
'grid_identity_source_info' or 'grid/identity-source',
54-
'grid_ilm_criteria_info' or 'grid/ilm-criteria',
55-
'grid_ilm_policies_info' or 'grid/ilm-policies',
56-
'grid_ilm_rules_info' or 'grid/ilm-rules',
57-
'grid_license_info' or 'grid/license',
58-
'grid_management_certificate_info' or 'grid/management-certificate',
59-
'grid_ntp_servers_info' or 'grid/ntp-servers',
60-
'grid_recovery_available_nodes_info' or 'grid/recovery/available-nodes',
61-
'grid_recovery_info' or 'grid/recovery',
62-
'grid_regions_info' or 'grid/regions',
63-
'grid_schemes_info' or 'grid/schemes',
64-
'grid_snmp_info' or 'grid/snmp',
65-
'grid_storage_api_certificate_info' or 'grid/storage-api-certificate',
66-
'grid_untrusted_client_network_info' or 'grid/untrusted-client-network',
67-
'grid_users_info' or 'grid/users',
68-
'grid_users_root_info' or 'grid/users/root',
69-
'versions_info' or 'versions'
70-
Can specify a list of values to include a larger subset.
32+
- When supplied, this argument will restrict the information collected to a given subset.
33+
- Either the info name or the REST API can be given.
34+
- Possible values for this argument include
35+
- C(grid_accounts_info) or C(grid/accounts)
36+
- C(grid_alarms_info) or C(grid/alarms)
37+
- C(grid_audit_info) or C(grid/audit)
38+
- C(grid_compliance_global_info) or C(grid/compliance-global)
39+
- C(grid_config_info) or C(grid/config)
40+
- C(grid_config_management_info) or C(grid/config/management)
41+
- C(grid_config_product_version_info) or C(grid/config/product-version)
42+
- C(grid_deactivated_features_info) or C(grid/deactivated-features)
43+
- C(grid_dns_servers_info) or C(grid/dns-servers)
44+
- C(grid_domain_names_info) or C(grid/domain-names)
45+
- C(grid_ec_profiles_info) or C(grid/ec-profiles)
46+
- C(grid_expansion_info) or C(grid/expansion)
47+
- C(grid_expansion_nodes_info) or C(grid/expansion/nodes)
48+
- C(grid_expansion_sites_info) or C(grid/expansion/sites)
49+
- C(grid_grid_networks_info) or C(grid/grid-networks)
50+
- C(grid_groups_info) or C(grid/groups)
51+
- C(grid_health_info) or C(grid/health)
52+
- C(grid_health_topology_info) or C(grid/health/topology)
53+
- C(grid_identity_source_info) or C(grid/identity-source)
54+
- C(grid_ilm_criteria_info) or C(grid/ilm-criteria)
55+
- C(grid_ilm_policies_info) or C(grid/ilm-policies)
56+
- C(grid_ilm_rules_info) or C(grid/ilm-rules)
57+
- C(grid_license_info) or C(grid/license)
58+
- C(grid_management_certificate_info) or C(grid/management-certificate)
59+
- C(grid_ntp_servers_info) or C(grid/ntp-servers)
60+
- C(grid_recovery_available_nodes_info) or C(grid/recovery/available-nodes)
61+
- C(grid_recovery_info) or C(grid/recovery)
62+
- C(grid_regions_info) or C(grid/regions)
63+
- C(grid_schemes_info) or C(grid/schemes)
64+
- C(grid_snmp_info) or C(grid/snmp)
65+
- C(grid_storage_api_certificate_info) or C(grid/storage-api-certificate)
66+
- C(grid_untrusted_client_network_info) or C(grid/untrusted-client-network)
67+
- C(grid_users_info) or C(grid/users)
68+
- C(grid_users_root_info) or C(grid/users/root)
69+
- C(versions_info) or C(versions)
70+
- Can specify a list of values to include a larger subset.
7171
default: all
7272
parameters:
7373
description:
74-
- Allows for any rest option to be passed in
74+
- Allows for any rest option to be passed in.
7575
type: dict
7676
"""
7777

7878
EXAMPLES = """
7979
- name: Gather StorageGRID Grid info
80-
na_sg_grid_info:
80+
netapp.storagegrid.na_sg_grid_info:
8181
api_url: "https://1.2.3.4/"
8282
auth_token: "storagegrid-auth-token"
8383
validate_certs: false
8484
register: sg_grid_info
8585
8686
- name: Gather StorageGRID Grid info for grid/accounts and grid/config subsets
87-
na_sg_grid_info:
87+
netapp.storagegrid.na_sg_grid_info:
8888
api_url: "https://1.2.3.4/"
8989
auth_token: "storagegrid-auth-token"
9090
validate_certs: false
@@ -94,7 +94,7 @@
9494
register: sg_grid_info
9595
9696
- name: Gather StorageGRID Grid info for all subsets
97-
na_sg_grid_info:
97+
netapp.storagegrid.na_sg_grid_info:
9898
api_url: "https://1.2.3.4/"
9999
auth_token: "storagegrid-auth-token"
100100
validate_certs: false
@@ -103,7 +103,7 @@
103103
register: sg_grid_info
104104
105105
- name: Gather StorageGRID Grid info for grid/accounts and grid/users subsets, limit to 5 results for each subset
106-
na_sg_grid_info:
106+
netapp.storagegrid.na_sg_grid_info:
107107
api_url: "https://1.2.3.4/"
108108
auth_token: "storagegrid-auth-token"
109109
validate_certs: false

plugins/modules/na_sg_grid_ntp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
default: present
3636
ntp_servers:
3737
description:
38-
- List of comma separated NTP server address
38+
- List of comma separated NTP server address.
3939
type: list
4040
elements: str
4141
required: true

0 commit comments

Comments
 (0)