← Back to branch summary

~verterok/charms/trusty/conn-check/fix-nrpe-check-hostname

« back to all changes in this revision

Viewing changes to hooks/hooks.py

  • Committer: Wes Mason
  • Date: 2015-03-06 17:05:10 UTC
  • mfrom: (7.3.22 precise-no-nagios)
  • Revision ID: wesley.mason@canonical.com-20150306170510-cyco58xpv2vq4sbn
Merge no-nagios changes from precise-no-nagios

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/hooks.py
22
22
    executed.
23
23
    """
24
24
    charmhelpers.payload.execd.execd_preinstall()
25
 
    charmhelpers.contrib.ansible.install_ansible_support(from_ppa=False)
 
25
    charmhelpers.contrib.ansible.install_ansible_support(from_ppa=True)
26
26
 
27
27
 
28
28
@hooks.action()
31
31
    return {}
32
32
 
33
33
 
 
34
@hooks.action()
 
35
def run_nagios_check():
 
36
    """usage: nagios check"""
 
37
    return {}
 
38
 
 
39
 
34
40
if __name__ == "__main__":
35
41
    hooks.execute(sys.argv)