From cd47cb2a15587c1fdd38e986b763a843497d6de7 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 9 Dec 2016 16:32:02 -0700 Subject: [PATCH] Remove remnants of obsolete fireball mode. --- ansible-core-sitemap.xml | 5 --- docsite/rst/playbooks_acceleration.rst | 7 --- lib/ansible/constants.py | 1 - .../modules/utilities/helper/_fireball.py | 43 ------------------- lib/ansible/utils/module_docs.py | 1 - packaging/macports/sysutils/ansible/Portfile | 1 - test/sanity/ansible-doc/skip.txt | 1 - test/sanity/validate-modules/skip.txt | 1 - 8 files changed, 60 deletions(-) delete mode 100644 lib/ansible/modules/utilities/helper/_fireball.py diff --git a/ansible-core-sitemap.xml b/ansible-core-sitemap.xml index ea05e356f36..95f56077c8f 100644 --- a/ansible-core-sitemap.xml +++ b/ansible-core-sitemap.xml @@ -1752,11 +1752,6 @@ weekly 0.3 - - http://docs.ansible.com/ansible/fireball_module.html - weekly - 0.3 - http://docs.ansible.com/ansible/gem_module.html weekly diff --git a/docsite/rst/playbooks_acceleration.rst b/docsite/rst/playbooks_acceleration.rst index 56a58ef4a4b..06d9df52b7a 100644 --- a/docsite/rst/playbooks_acceleration.rst +++ b/docsite/rst/playbooks_acceleration.rst @@ -37,13 +37,6 @@ the SSH connection (this key is different for every host, and is also regenerate By default, Ansible will use port 5099 for the accelerated connection, though this is configurable. Once running, the daemon will accept connections for 30 minutes, after which time it will terminate itself and need to be restarted over SSH. -Accelerated mode offers several improvements over the (deprecated) original fireball mode from which it was based: - -* No bootstrapping is required, only a single line needs to be added to each play you wish to run in accelerated mode. -* Support for sudo commands (see below for more details and caveats) is available. -* There are fewer requirements. ZeroMQ is no longer required, nor are there any special packages beyond python-keyczar -* python 2.5 or higher is required. - In order to use accelerated mode, simply add `accelerate: true` to your play:: --- diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index f749291ffb9..8081f790a5b 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -336,7 +336,6 @@ PERSISTENT_CONNECT_RETRIES = get_config(p, 'persistent_connection', 'connect PERSISTENT_CONNECT_INTERVAL = get_config(p, 'persistent_connection', 'connect_interval', 'ANSIBLE_PERSISTENT_CONNECT_INTERVAL', 1, value_type='integer') # obsolete -- will be formally removed -ZEROMQ_PORT = get_config(p, 'fireball_connection', 'zeromq_port', 'ANSIBLE_ZEROMQ_PORT', 5099, value_type='integer') ACCELERATE_PORT = get_config(p, 'accelerate', 'accelerate_port', 'ACCELERATE_PORT', 5099, value_type='integer') ACCELERATE_TIMEOUT = get_config(p, 'accelerate', 'accelerate_timeout', 'ACCELERATE_TIMEOUT', 30, value_type='integer') ACCELERATE_CONNECT_TIMEOUT = get_config(p, 'accelerate', 'accelerate_connect_timeout', 'ACCELERATE_CONNECT_TIMEOUT', 1.0, value_type='float') diff --git a/lib/ansible/modules/utilities/helper/_fireball.py b/lib/ansible/modules/utilities/helper/_fireball.py deleted file mode 100644 index d3bc837fa4f..00000000000 --- a/lib/ansible/modules/utilities/helper/_fireball.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -# (c) 2012, Michael DeHaan -# -# 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 . - -ANSIBLE_METADATA = {'status': ['deprecated'], - 'supported_by': 'community', - 'version': '1.0'} - -DOCUMENTATION = ''' ---- -module: fireball -short_description: Enable fireball mode on remote node -version_added: "0.9" -deprecated: "in favor of SSH with ControlPersist" -description: - - Modern SSH clients support ControlPersist which is just as fast as - fireball was. Please enable that in ansible.cfg as a replacement - for fireball. - - Removed in ansible 2.0. -author: - - "Ansible Core Team" - - "Michael DeHaan" -''' - -EXAMPLES = ''' -''' - diff --git a/lib/ansible/utils/module_docs.py b/lib/ansible/utils/module_docs.py index 0a12cddb9af..7f7217fa2ec 100755 --- a/lib/ansible/utils/module_docs.py +++ b/lib/ansible/utils/module_docs.py @@ -42,7 +42,6 @@ except ImportError: BLACKLIST_MODULES = frozenset(( 'async_wrapper', 'accelerate', - 'fireball', )) def get_docstring(filename, verbose=False): diff --git a/packaging/macports/sysutils/ansible/Portfile b/packaging/macports/sysutils/ansible/Portfile index e041ffcbf60..b123fc58ff0 100644 --- a/packaging/macports/sysutils/ansible/Portfile +++ b/packaging/macports/sysutils/ansible/Portfile @@ -33,7 +33,6 @@ python.default_version 27 depends_lib-append port:py${python.version}-jinja2 \ port:py${python.version}-paramiko \ port:py${python.version}-yaml -# fireball mode requires py-zmq, py-asn1, py-crypto and py-keyczar patch { fs-traverse f ${worksrcpath} { diff --git a/test/sanity/ansible-doc/skip.txt b/test/sanity/ansible-doc/skip.txt index aa47f27dfd7..6232cbb552f 100644 --- a/test/sanity/ansible-doc/skip.txt +++ b/test/sanity/ansible-doc/skip.txt @@ -1,2 +1 @@ async_wrapper -fireball diff --git a/test/sanity/validate-modules/skip.txt b/test/sanity/validate-modules/skip.txt index 693a4aeada2..b06240bf137 100644 --- a/test/sanity/validate-modules/skip.txt +++ b/test/sanity/validate-modules/skip.txt @@ -1,3 +1,2 @@ lib/ansible/modules/utilities/logic/async_status.py -lib/ansible/modules/utilities/helper/_fireball.py lib/ansible/modules/utilities/helper/_accelerate.py