← Back to branch summary

~brad-marshall/charms/trusty/thruk-master/add-debug-options

« back to all changes in this revision

Viewing changes to tests/10-deploy

  • Committer: Brad Marshall
  • Date: 2015-05-22 04:34:17 UTC
  • Revision ID: brad.marshall@canonical.com-20150522043417-kwpg3kt0d63qw0cz
[bradm] Added more exception catching, updated thruk-agent url to be LP

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/10-deploy
8
8
d = amulet.Deployment(juju_deployer='juju-deployer -d -v', series='trusty')
9
9
 
10
10
d.add('thruk-master')
11
 
d.add('thruk-agent', charm='/home/bradm/src/juju/trusty/thruk-agent')
 
11
d.add('thruk-agent', charm='lp:~brad-marshall/charms/trusty/thruk-agent/trunk')
12
12
d.add('nagios')
13
13
 
14
14
d.relate('nagios:juju-info', 'thruk-agent:general-info')
29
29
##
30
30
thruk_unit = d.sentry.unit['thruk-master/0']
31
31
 
32
 
thrukpwd = thruk_unit.file_contents('/var/lib/thruk/thrukadmin.passwd').strip()
 
32
try:
 
33
    thrukpwd = thruk_unit.file_contents('/var/lib/thruk/thrukadmin.passwd').strip()
 
34
except:
 
35
    raise
33
36
 
34
37
host_url = ("http://%s/thruk/")
35
38
try:
36
39
    r = requests.get(host_url % thruk_unit.info['public-address'],
37
40
                     auth=('thrukadmin', thrukpwd))
38
41
except:
39
 
    amulet.raise_status(amulet.ERROR, msg="Can't get to thruk URL")
 
42
    raise