cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Switch from deprecated ANSIBLE_VERSION to ansible.__version__

Browse source
This commit is contained in:
Toshio Kuratomi 2016-04-24 21:14:30 -07:00
parent de22b721db
commit d871df6c27
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
files/blockinfile.py
View file

@ -18,10 +18,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
import re
import os
import tempfile
DOCUMENTATION = """ DOCUMENTATION = """
--- ---
module: blockinfile module: blockinfile
@ -150,6 +146,12 @@ EXAMPLES = r"""
- { name: host3, ip: 10.10.1.12 } - { name: host3, ip: 10.10.1.12 }
""" """
import re
import os
import tempfile
from ansible import __version__
def write_changes(module, contents, dest): def write_changes(module, contents, dest):
@ -244,7 +246,7 @@ def main():
marker1 = re.sub(r'{mark}', 'END', marker) marker1 = re.sub(r'{mark}', 'END', marker)
if present and block: if present and block:
# Escape seqeuences like '\n' need to be handled in Ansible 1.x # Escape seqeuences like '\n' need to be handled in Ansible 1.x
if ANSIBLE_VERSION.startswith('1.'): if __version__.startswith('1.'):
block = re.sub('', block, '') block = re.sub('', block, '')
blocklines = [marker0] + block.splitlines() + [marker1] blocklines = [marker0] + block.splitlines() + [marker1]
else: else: