prevent installation of docker from upstream
This commit is contained in:
@@ -38,7 +38,6 @@ from charmhelpers.core import hookenv, unitdata
|
||||
from charmhelpers.core.host import service_stop, service_restart
|
||||
from charmhelpers.contrib.charmsupport import nrpe
|
||||
|
||||
|
||||
# Override the default nagios shortname regex to allow periods, which we
|
||||
# need because our bin names contain them (e.g. 'snap.foo.daemon'). The
|
||||
# default regex in charmhelpers doesn't allow periods, but nagios itself does.
|
||||
@@ -53,6 +52,10 @@ db = unitdata.kv()
|
||||
|
||||
@hook('upgrade-charm')
|
||||
def upgrade_charm():
|
||||
# Trigger removal of PPA docker installation if it was previously set.
|
||||
set_state('config.changed.install_from_upstream')
|
||||
hookenv.atexit(remove_state, 'config.changed.install_from_upstream')
|
||||
|
||||
cleanup_pre_snap_services()
|
||||
check_resources_for_upgrade_needed()
|
||||
|
||||
|
Reference in New Issue
Block a user