← Back to branch summary

~openstack-charmers-next/charms/xenial/swift-storage/trunk

« back to all changes in this revision

Viewing changes to hooks/swift_storage_hooks.py

  • Committer: Edward Hope-Morley
  • Date: 2016-03-24 11:11:58 UTC
  • Revision ID: edward.hope-morley@canonical.com-20160324111158-4whr78jd2v9yihw2
Add hardening support

Add charmhelpers.contrib.hardening and calls to install,
config-changed, upgrade-charm and update-status hooks.
Also add new config option to allow one or more hardening
modules to be applied at runtime.

Change-Id: If0d1e10b58ed506e0aca659f30120b8d5c96c04f

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/swift_storage_hooks.py
52
52
    get_ipv6_addr
53
53
)
54
54
from charmhelpers.contrib.charmsupport import nrpe
 
55
from charmhelpers.contrib.hardening.harden import harden
55
56
 
56
57
from distutils.dir_util import mkpath
57
58
 
62
63
 
63
64
 
64
65
@hooks.hook('install.real')
 
66
@harden()
65
67
def install():
66
68
    status_set('maintenance', 'Executing pre-install')
67
69
    execd_preinstall()
76
78
 
77
79
@hooks.hook('config-changed')
78
80
@pause_aware_restart_on_change(RESTART_MAP)
 
81
@harden()
79
82
def config_changed():
80
83
    if config('prefer-ipv6'):
81
84
        status_set('maintenance', 'Configuring ipv6')
102
105
 
103
106
 
104
107
@hooks.hook('upgrade-charm')
 
108
@harden()
105
109
def upgrade_charm():
106
110
    apt_install(filter_installed_packages(PACKAGES), fatal=True)
107
111
    update_nrpe_config()
179
183
    nrpe_setup.write()
180
184
 
181
185
 
 
186
@hooks.hook('update-status')
 
187
@harden()
 
188
def update_status():
 
189
    log('Updating status.')
 
190
 
 
191
 
182
192
def main():
183
193
    try:
184
194
        hooks.execute(sys.argv)