From 106c7885b86b42223c07851dccaeb8de25c19fc4 Mon Sep 17 00:00:00 2001 From: Chris Archibald Date: Thu, 7 Mar 2019 10:35:50 -0800 Subject: [PATCH] Fix Examples with bad options (#53279) * Revert "changes to clusteR" This reverts commit 33ee1b71e4bc8435fb315762a871f8c4cb6c5f80. * Revert "changes to clusteR" This reverts commit 33ee1b71e4bc8435fb315762a871f8c4cb6c5f80. * Revert "Revert "changes to clusteR"" This reverts commit f1104a37b42886aebb4d2b2ab27c91c96d97858a. * Revert "Revert "changes to clusteR"" This reverts commit f1104a37b42886aebb4d2b2ab27c91c96d97858a. * documentation changes * Revert "documentation changes" This reverts commit 02c369d0414fdff492d90865c903bdade3174261. * Doc updates * fix doc --- lib/ansible/modules/storage/netapp/na_ontap_cg_snapshot.py | 4 ++-- lib/ansible/modules/storage/netapp/na_ontap_cifs_acl.py | 7 +++++-- lib/ansible/modules/storage/netapp/na_ontap_cifs_server.py | 6 +++--- .../modules/storage/netapp/na_ontap_igroup_initiator.py | 4 ++-- lib/ansible/modules/storage/netapp/na_ontap_ntp.py | 4 +++- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/ansible/modules/storage/netapp/na_ontap_cg_snapshot.py b/lib/ansible/modules/storage/netapp/na_ontap_cg_snapshot.py index 4a4d5ff5e4..4ba320e2b6 100644 --- a/lib/ansible/modules/storage/netapp/na_ontap_cg_snapshot.py +++ b/lib/ansible/modules/storage/netapp/na_ontap_cg_snapshot.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# (c) 2018, NetApp, Inc +# (c) 2018-2019, NetApp, Inc # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function @@ -53,7 +53,7 @@ EXAMPLES = """ state: present vserver: vserver_name snapshot: snapshot name - volume: vol_name + volumes: vol_name username: "{{ netapp username }}" password: "{{ netapp password }}" hostname: "{{ netapp hostname }}" diff --git a/lib/ansible/modules/storage/netapp/na_ontap_cifs_acl.py b/lib/ansible/modules/storage/netapp/na_ontap_cifs_acl.py index 4cae456f72..d959f9837f 100644 --- a/lib/ansible/modules/storage/netapp/na_ontap_cifs_acl.py +++ b/lib/ansible/modules/storage/netapp/na_ontap_cifs_acl.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# (c) 2018, NetApp, Inc +# (c) 2018-2019, NetApp, Inc # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function @@ -40,7 +40,7 @@ options: description: - "The user or group name for which the permissions are listed." required: true -short_description: "NetApp ONTAP manage cifs-share-access-control" +short_description: NetApp ONTAP manage cifs-share-access-control version_added: "2.6" ''' @@ -52,6 +52,7 @@ EXAMPLES = """ share_name: cifsShareName user_or_group: Everyone permission: read + vserver: "{{ netapp_vserver }}" hostname: "{{ netapp_hostname }}" username: "{{ netapp_username }}" password: "{{ netapp_password }}" @@ -59,7 +60,9 @@ EXAMPLES = """ na_ontap_cifs_acl: state: present share_name: cifsShareName + user_or_group: Everyone permission: change + vserver: "{{ netapp_vserver }}" hostname: "{{ netapp_hostname }}" username: "{{ netapp_username }}" password: "{{ netapp_password }}" diff --git a/lib/ansible/modules/storage/netapp/na_ontap_cifs_server.py b/lib/ansible/modules/storage/netapp/na_ontap_cifs_server.py index 55965ccf20..d031232a03 100644 --- a/lib/ansible/modules/storage/netapp/na_ontap_cifs_server.py +++ b/lib/ansible/modules/storage/netapp/na_ontap_cifs_server.py @@ -1,7 +1,7 @@ #!/usr/bin/python """ this is cifs_server module - (c) 2018, NetApp, Inc + (c) 2018-2019, NetApp, Inc # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """ @@ -71,7 +71,7 @@ options: type: bool description: - If this is set and a machine account with the same name as - specified in 'cifs_server_name' exists in the Active Directory, it + specified in 'name' exists in the Active Directory, it will be overwritten and reused. version_added: '2.7' @@ -94,7 +94,7 @@ EXAMPLES = ''' - name: Delete cifs_server na_ontap_cifs_server: state: absent - cifs_server_name: data2 + name: data2 vserver: svm1 hostname: "{{ netapp_hostname }}" username: "{{ netapp_username }}" diff --git a/lib/ansible/modules/storage/netapp/na_ontap_igroup_initiator.py b/lib/ansible/modules/storage/netapp/na_ontap_igroup_initiator.py index f65a1eba5e..510945924f 100644 --- a/lib/ansible/modules/storage/netapp/na_ontap_igroup_initiator.py +++ b/lib/ansible/modules/storage/netapp/na_ontap_igroup_initiator.py @@ -55,7 +55,7 @@ options: EXAMPLES = ''' - name: Add initiators to an igroup na_ontap_igroup_initiator: - names: abc.test:def.com, def.test:efg.com + names: abc.test:def.com,def.test:efg.com initiator_group: test_group vserver: ansibleVServer hostname: "{{ netapp_hostname }}" @@ -65,7 +65,7 @@ EXAMPLES = ''' - name: Remove an initiator from an igroup na_ontap_igroup_initiator: state: absent - name: abc.test:def.com + names: abc.test:def.com initiator_group: test_group vserver: ansibleVServer hostname: "{{ netapp_hostname }}" diff --git a/lib/ansible/modules/storage/netapp/na_ontap_ntp.py b/lib/ansible/modules/storage/netapp/na_ontap_ntp.py index 60fd1fa95b..6c57880587 100644 --- a/lib/ansible/modules/storage/netapp/na_ontap_ntp.py +++ b/lib/ansible/modules/storage/netapp/na_ontap_ntp.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# (c) 2018, NetApp, Inc +# (c) 2018-2019, NetApp, Inc # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function @@ -43,12 +43,14 @@ EXAMPLES = """ na_ontap_ntp: state: present version: auto + server_name: "{{ server_name }}" hostname: "{{ netapp_hostname }}" username: "{{ netapp_username }}" password: "{{ netapp_password }}" - name: Delete NTP server na_ontap_ntp: state: absent + server_name: "{{ server_name }}" hostname: "{{ netapp_hostname }}" username: "{{ netapp_username }}" password: "{{ netapp_password }}"