diff --git a/CHANGELOG.md b/CHANGELOG.md index c0bd9340f2d..6332ed4d462 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,20 +66,19 @@ Ansible Changes By Release - cloudstack * cs_router * cs_snapshot_policy -- dnos6 - * dnos6_command - * dnos6_template - * dnos6_config -- dnos9 - * dnos9_command - * dnos9_config - * dnos9_template - * dnos9_facts -- dnos10 - * dnos10_command - * dnos10_config - * dnos10_template - * dnos10_facts +- dellos6 + * dellos6_command + * dellos6_config +- dellos9 + * dellos9_command + * dellos9_config + * dellos9_facts + * dellos9_template +- dellos10 + * dellos10_command + * dellos10_config + * dellos10_facts + * dellos10_template - exoscale: * exo_dns_domain * exo_dns_record diff --git a/lib/ansible/module_utils/dnos10.py b/lib/ansible/module_utils/dellos10.py similarity index 97% rename from lib/ansible/module_utils/dnos10.py rename to lib/ansible/module_utils/dellos10.py index 7ca9448d210..12c11cfe935 100644 --- a/lib/ansible/module_utils/dnos10.py +++ b/lib/ansible/module_utils/dellos10.py @@ -1,3 +1,8 @@ +# +# (c) 2015 Peter Sprygada, +# +# Copyright (c) 2016 Dell Inc. +# # This code is part of Ansible, but is an independent component. # This particular file snippet, and this file snippet only, is BSD licensed. # Modules you write using this snippet, which is embedded dynamically by Ansible diff --git a/lib/ansible/module_utils/dnos6.py b/lib/ansible/module_utils/dellos6.py similarity index 97% rename from lib/ansible/module_utils/dnos6.py rename to lib/ansible/module_utils/dellos6.py index 9b5e95ea46f..1351feddfc0 100644 --- a/lib/ansible/module_utils/dnos6.py +++ b/lib/ansible/module_utils/dellos6.py @@ -1,3 +1,8 @@ +# +# (c) 2015 Peter Sprygada, +# +# Copyright (c) 2016 Dell Inc. +# # This code is part of Ansible, but is an independent component. # This particular file snippet, and this file snippet only, is BSD licensed. # Modules you write using this snippet, which is embedded dynamically by Ansible diff --git a/lib/ansible/module_utils/dnos9.py b/lib/ansible/module_utils/dellos9.py similarity index 98% rename from lib/ansible/module_utils/dnos9.py rename to lib/ansible/module_utils/dellos9.py index 85b431a5a4f..536dd2a92a1 100755 --- a/lib/ansible/module_utils/dnos9.py +++ b/lib/ansible/module_utils/dellos9.py @@ -1,3 +1,8 @@ +# +# (c) 2015 Peter Sprygada, +# +# Copyright (c) 2016 Dell Inc. +# # This code is part of Ansible, but is an independent component. # This particular file snippet, and this file snippet only, is BSD licensed. # Modules you write using this snippet, which is embedded dynamically by Ansible diff --git a/lib/ansible/plugins/action/dnos6_config.py b/lib/ansible/plugins/action/dellos10_config.py similarity index 100% rename from lib/ansible/plugins/action/dnos6_config.py rename to lib/ansible/plugins/action/dellos10_config.py diff --git a/lib/ansible/plugins/action/dnos6_template.py b/lib/ansible/plugins/action/dellos10_template.py similarity index 100% rename from lib/ansible/plugins/action/dnos6_template.py rename to lib/ansible/plugins/action/dellos10_template.py diff --git a/lib/ansible/plugins/action/dnos9_config.py b/lib/ansible/plugins/action/dellos6_config.py similarity index 100% rename from lib/ansible/plugins/action/dnos9_config.py rename to lib/ansible/plugins/action/dellos6_config.py diff --git a/lib/ansible/plugins/action/dnos10_config.py b/lib/ansible/plugins/action/dellos9_config.py similarity index 94% rename from lib/ansible/plugins/action/dnos10_config.py rename to lib/ansible/plugins/action/dellos9_config.py index 13bcd553451..ffcb0f057f8 100644 --- a/lib/ansible/plugins/action/dnos10_config.py +++ b/lib/ansible/plugins/action/dellos9_config.py @@ -1,4 +1,6 @@ # +# Copyright 2015 Peter Sprygada +# # This file is part of Ansible # # Ansible is free software: you can redistribute it and/or modify diff --git a/lib/ansible/plugins/action/dnos9_template.py b/lib/ansible/plugins/action/dellos9_template.py similarity index 100% rename from lib/ansible/plugins/action/dnos9_template.py rename to lib/ansible/plugins/action/dellos9_template.py diff --git a/lib/ansible/plugins/action/dnos10_template.py b/lib/ansible/plugins/action/dnos10_template.py deleted file mode 100644 index cf629295250..00000000000 --- a/lib/ansible/plugins/action/dnos10_template.py +++ /dev/null @@ -1,25 +0,0 @@ -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . -# -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - -from ansible.plugins.action import ActionBase -from ansible.plugins.action.net_template import ActionModule as NetActionModule - -class ActionModule(NetActionModule, ActionBase): - pass - - diff --git a/lib/ansible/utils/module_docs_fragments/dnos10.py b/lib/ansible/utils/module_docs_fragments/dellos10.py similarity index 92% rename from lib/ansible/utils/module_docs_fragments/dnos10.py rename to lib/ansible/utils/module_docs_fragments/dellos10.py index 567de5fa82b..cfd83768766 100644 --- a/lib/ansible/utils/module_docs_fragments/dnos10.py +++ b/lib/ansible/utils/module_docs_fragments/dellos10.py @@ -1,4 +1,9 @@ -# This file is part of Ansible # +# +# (c) 2015, Peter Sprygada +# +# Copyright (c) 2016 Dell Inc. +# +# This file is part of Ansible # Ansible is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or @@ -59,7 +64,7 @@ options: default: 10 provider: description: - - Convenience method that allows all M(dnos10) arguments to be passed as + - Convenience method that allows all M(dellos10) arguments to be passed as a dict object. All constraints (required, choices, etc) must be met either by individual arguments or values in this dict. required: false diff --git a/lib/ansible/utils/module_docs_fragments/dnos9.py b/lib/ansible/utils/module_docs_fragments/dellos6.py old mode 100755 new mode 100644 similarity index 95% rename from lib/ansible/utils/module_docs_fragments/dnos9.py rename to lib/ansible/utils/module_docs_fragments/dellos6.py index 9df9d121ffd..dd9944b9959 --- a/lib/ansible/utils/module_docs_fragments/dnos9.py +++ b/lib/ansible/utils/module_docs_fragments/dellos6.py @@ -1,3 +1,8 @@ +# +# (c) 2015, Peter Sprygada +# +# Copyright (c) 2016 Dell Inc. +# # This file is part of Ansible # # Ansible is free software: you can redistribute it and/or modify @@ -77,7 +82,7 @@ options: default: 10 provider: description: - - Convenience method that allows all M(dnos9) arguments to be passed as + - Convenience method that allows all M(dellos6) arguments to be passed as a dict object. All constraints (required, choices, etc) must be met either by individual arguments or values in this dict. required: false diff --git a/lib/ansible/utils/module_docs_fragments/dnos6.py b/lib/ansible/utils/module_docs_fragments/dellos9.py old mode 100644 new mode 100755 similarity index 95% rename from lib/ansible/utils/module_docs_fragments/dnos6.py rename to lib/ansible/utils/module_docs_fragments/dellos9.py index 28d732add37..66aa12825c2 --- a/lib/ansible/utils/module_docs_fragments/dnos6.py +++ b/lib/ansible/utils/module_docs_fragments/dellos9.py @@ -1,3 +1,8 @@ +# +# (c) 2015, Peter Sprygada +# +# Copyright (c) 2016 Dell Inc. +# # This file is part of Ansible # # Ansible is free software: you can redistribute it and/or modify @@ -77,7 +82,7 @@ options: default: 10 provider: description: - - Convenience method that allows all M(dnos6) arguments to be passed as + - Convenience method that allows all M(dellos9) arguments to be passed as a dict object. All constraints (required, choices, etc) must be met either by individual arguments or values in this dict. required: false