From 7f92741c3d81bfa0bbb1808a015987ed18ffc96c Mon Sep 17 00:00:00 2001 From: paulquack Date: Mon, 30 Oct 2017 18:04:29 +1100 Subject: [PATCH] Remove references to provider in documentation, update license (#32242) --- lib/ansible/module_utils/ironware.py | 35 +++++++------------ .../network/ironware/ironware_command.py | 15 -------- 2 files changed, 13 insertions(+), 37 deletions(-) diff --git a/lib/ansible/module_utils/ironware.py b/lib/ansible/module_utils/ironware.py index d59973f3d95..a07f62b1050 100644 --- a/lib/ansible/module_utils/ironware.py +++ b/lib/ansible/module_utils/ironware.py @@ -1,29 +1,20 @@ -# 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 -# still belong to the author of the module, and may assign their own license -# to the complete work. # -# (c) 2016 Red Hat Inc. +# Copyright (c) 2017, Paul Baker # -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: +# This file is part of Ansible # -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. +# 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. # -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 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 diff --git a/lib/ansible/modules/network/ironware/ironware_command.py b/lib/ansible/modules/network/ironware/ironware_command.py index 52e8e663b4b..5145a695102 100644 --- a/lib/ansible/modules/network/ironware/ironware_command.py +++ b/lib/ansible/modules/network/ironware/ironware_command.py @@ -71,29 +71,14 @@ options: """ EXAMPLES = """ -# Note: examples below use the following provider dict to handle -# transport and authentication to the node. ---- -vars: - cli: - host: "{{ inventory_hostname }}" - username: username - password: secret - authorize: yes - auth_pass: supersecret - transport: cli - ---- - ironware_command: commands: - show version - provider: "{{ cli }}" - ironware_command: commands: - show interfaces brief wide - show mpls vll - provider: "{{ cli }}" """ RETURN = """