Browse code

Adds missing docs and downstream fixes (#29664)

Partition docs are not a documentation fragment, so they need to
be added
(cherry picked from commit a36ebd979d9b8438e96ec9929f70dcb15a388ca9)

Tim Rupp authored on 2017/09/12 07:30:34
Showing 1 changed files
... ...
@@ -18,9 +18,11 @@
18 18
 # You should have received a copy of the GNU General Public License
19 19
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
20 20
 
21
-ANSIBLE_METADATA = {'metadata_version': '1.1',
22
-                    'status': ['preview'],
23
-                    'supported_by': 'community'}
21
+ANSIBLE_METADATA = {
22
+    'status': ['preview'],
23
+    'supported_by': 'community',
24
+    'metadata_version': '1.1'
25
+}
24 26
 
25 27
 DOCUMENTATION = '''
26 28
 ---
... ...
@@ -71,6 +73,11 @@ options:
71 71
     choices:
72 72
       - present
73 73
       - absent
74
+  partition:
75
+    description:
76
+      - Device partition to manage resources on.
77
+    required: False
78
+    default: 'Common'
74 79
 notes:
75 80
   - Requires the f5-sdk Python package on the host. This is as easy as pip
76 81
     install f5-sdk.
... ...
@@ -116,15 +123,6 @@ RETURN = '''
116 116
 import re
117 117
 import uuid
118 118
 
119
-try:
120
-    from StringIO import StringIO
121
-except ImportError:
122
-    from io import StringIO
123
-
124
-from f5.utils.iapp_parser import (
125
-    NonextantTemplateNameException
126
-)
127
-
128 119
 from ansible.module_utils.f5_utils import (
129 120
     AnsibleF5Client,
130 121
     AnsibleF5Parameters,
... ...
@@ -134,6 +132,14 @@ from ansible.module_utils.f5_utils import (
134 134
     defaultdict,
135 135
     iControlUnexpectedHTTPError
136 136
 )
137
+from f5.utils.iapp_parser import (
138
+    NonextantTemplateNameException
139
+)
140
+
141
+try:
142
+    from StringIO import StringIO
143
+except ImportError:
144
+    from io import StringIO
137 145
 
138 146
 
139 147
 class Parameters(AnsibleF5Parameters):
... ...
@@ -456,9 +462,6 @@ class ArgumentSpec(object):
456 456
             content=dict()
457 457
         )
458 458
         self.f5_product_name = 'bigip'
459
-        self.mutually_exclusive = [
460
-            ['sync_device_to_group', 'sync_group_to_device']
461
-        ]
462 459
 
463 460
 
464 461
 def main():
... ...
@@ -470,8 +473,7 @@ def main():
470 470
     client = AnsibleF5Client(
471 471
         argument_spec=spec.argument_spec,
472 472
         supports_check_mode=spec.supports_check_mode,
473
-        f5_product_name=spec.f5_product_name,
474
-        mutually_exclusive=spec.mutually_exclusive
473
+        f5_product_name=spec.f5_product_name
475 474
     )
476 475
 
477 476
     try: