Merge "Merge the merge_yaml and merge_config module into one"

ansible/action_plugins/merge_configs.py

@@ -15,6 +15,41 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+DOCUMENTATION = '''
+---
+module: merge_configs
+short_description: Merge ini-style configs
+description:
+     - ConfigParser is used to merge several ini-style configs into one
+options:
+  dest:
+    description:
+      - The destination file name
+    required: True
+    type: str
+  sources:
+    description:
+      - A list of files on the destination node to merge together
+    default: None
+    required: True
+    type: str
+author: Sam Yaple
+'''
+
+EXAMPLES = '''
+Merge multiple configs:
+
+- hosts: database
+  tasks:
+    - name: Merge configs
+      merge_configs:
+        sources:
+          - "/tmp/config_1.cnf"
+          - "/tmp/config_2.cnf"
+          - "/tmp/config_3.cnf"
+        dest:
+          - "/etc/mysql/my.cnf"
+'''
 
 import collections
 import inspect

ansible/action_plugins/merge_yaml.py

@@ -15,6 +15,41 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+DOCUMENTATION = '''
+---
+module: merge_yaml
+short_description: Merge yaml-style configs
+description:
+     - PyYAML is used to merge several yaml files into one
+options:
+  dest:
+    description:
+      - The destination file name
+    required: True
+    type: str
+  sources:
+    description:
+      - A list of files on the destination node to merge together
+    default: None
+    required: True
+    type: str
+author: Sean Mooney
+'''
+
+EXAMPLES = '''
+Merge multiple yaml files:
+
+- hosts: localhost
+  tasks:
+    - name: Merge yaml files
+      merge_yaml:
+        sources:
+          - "/tmp/default.yml"
+          - "/tmp/override.yml"
+        dest:
+          - "/tmp/out.yml"
+'''
+
 import inspect
 import os
 import shutil

ansible/library/merge_configs.py

@@ -1,51 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright 2015 Sam Yaple
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-DOCUMENTATION = '''
----
-module: merge_configs
-short_description: Merge ini-style configs
-description:
-     - ConfigParser is used to merge several ini-style configs into one
-options:
-  dest:
-    description:
-      - The destination file name
-    required: True
-    type: str
-  sources:
-    description:
-      - A list of files on the destination node to merge together
-    default: None
-    required: True
-    type: str
-author: Sam Yaple
-'''
-
-EXAMPLES = '''
-Merge multiple configs:
-
-- hosts: database
-  tasks:
-    - name: Merge configs
-      merge_configs:
-        sources:
-          - "/tmp/config_1.cnf"
-          - "/tmp/config_2.cnf"
-          - "/tmp/config_3.cnf"
-        dest:
-          - "/etc/mysql/my.cnf"
-'''

ansible/library/merge_yaml.py

@@ -1,51 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright 2015 Sam Yaple
-# Copyright 2016 intel
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-DOCUMENTATION = '''
----
-module: merge_yaml
-short_description: Merge yaml-style configs
-description:
-     - PyYAML is used to merge several yaml files into one
-options:
-  dest:
-    description:
-      - The destination file name
-    required: True
-    type: str
-  sources:
-    description:
-      - A list of files on the destination node to merge together
-    default: None
-    required: True
-    type: str
-author: Sean Mooney
-'''
-
-EXAMPLES = '''
-Merge multiple yaml files:
-
-- hosts: localhost
-  tasks:
-    - name: Merge yaml files
-      merge_yaml:
-        sources:
-          - "/tmp/default.yml"
-          - "/tmp/override.yml"
-        dest:
-          - "/tmp/out.yml"
-'''