saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

consolidate tomcat exec and state version extract

Browse source
This commit is contained in:
Justin Findlay 2015-07-08 15:40:36 -06:00
parent 59dc833567
commit fd4fca172d
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/modules/tomcat.py
View file

@ -169,6 +169,14 @@ def _auth(uri):
return _build_opener(basic, digest)
def _extract_version(war):
'''
extract the version from the war name
'''
version = re.findall("-([\\d.-]+)$", os.path.basename(war).replace('.war', ''))
return version[0] if len(version) == 1 else None
def _wget(cmd, opts=None, url='http://localhost:8080/manager', timeout=180):
'''
A private function used to issue the command to tomcat via the manager
@ -572,11 +580,7 @@ def deploy_war(war,
else:
tfile = war
version_extract = re.findall("-([\\d.-]+)$", os.path.basename(war).replace('.war', ''))
if len(version_extract) == 1:
version_string = version_extract[0]
else:
version_string = None
version_string = _extract_version(war)
# Prepare options
opts = {

12
salt/states/tomcat.py
View file

@ -40,8 +40,10 @@ Notes:
Apache Tomcat/7.0.37
'''
from __future__ import absolute_import
import re
# import salt libs
from salt.modules.tomcat import _extract_version
# Private
@ -100,11 +102,7 @@ def war_deployed(name,
'comment': ''}
basename = war.split('/')[-1]
version_extract = re.findall("-([\\d.-]+)$", basename.replace('.war', ''))
if len(version_extract) == 1:
version = version_extract[0]
else:
version = None
version = _extract_version(basename)
webapps = __salt__['tomcat.ls'](url, timeout)
deploy = False
@ -113,7 +111,7 @@ def war_deployed(name,
# Determine what to do
try:
if (version != webapps[name]['version']) or force:
if not webapps[name]['version'].endswith(version) or force:
deploy = True
undeploy = True
ret['changes']['undeploy'] = ('undeployed {0} in version {1}'.