← Back to branch summary

~charmers/charms/precise/tomcat7/precise

« back to all changes in this revision

Viewing changes to templates/tomcat_server_xml.tmpl

  • Committer: James Page
  • Date: 2011-10-11 12:02:53 UTC
  • Revision ID: james.page@canonical.com-20111011120253-lacpa7w2e7ggjl7p
Fixup private-address handling so it works in all environment types

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/tomcat_server_xml.tmpl
3
3
import subprocess
4
4
import json
5
5
import os
 
6
import re
6
7
 
7
8
cmd = [ 'config-get' , '--format', 'json' ]
8
9
config = json.loads(subprocess.check_output(cmd))
9
10
cmd = [ 'unit-get' , 'private-address' ]
10
11
private_address = subprocess.check_output(cmd).strip()
 
12
 
 
13
pattern = r"\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b"
 
14
if not re.match(pattern,private_address):
 
15
    cmd = [ 'dig' , '+short', private_address ]
 
16
    private_address = subprocess.check_output(cmd).strip()
 
17
 
11
18
cmd = [ 'unit-get' , 'public-address' ]
12
19
public_address = subprocess.check_output(cmd).strip()
13
20
jvm_route = os.environ['JUJU_UNIT_NAME'].replace('/','-')