Remove remnants of obsolete fireball mode.

pva · Dec 9, 2016 · cd47cb2 · cd47cb2
1 parent ac7edef
commit cd47cb2
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 60 deletions.
diff --git a/ansible-core-sitemap.xml b/ansible-core-sitemap.xml
@@ -1752,11 +1752,6 @@
 		<changefreq>weekly</changefreq>
 		<priority>0.3</priority>
 	</url>
-	<url>
-		<loc>http://docs.ansible.com/ansible/fireball_module.html</loc>
-		<changefreq>weekly</changefreq>
-		<priority>0.3</priority>
-	</url>
 	<url>
 		<loc>http://docs.ansible.com/ansible/gem_module.html</loc>
 		<changefreq>weekly</changefreq>

diff --git 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
@@ -336,7 +336,6 @@ def load_config_file():
 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
diff --git a/lib/ansible/utils/module_docs.py b/lib/ansible/utils/module_docs.py
@@ -42,7 +42,6 @@
 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
@@ -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
@@ -1,2 +1 @@
 async_wrapper
-fireball
diff --git 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