Merge ~kwmonroe/layer-leadership:master into layer-leadership:master

[Kevin W Monroe]

Remove the hooks from the leadership layer. These are now provided by layer:basic:

https://github.com/juju-solutions/layer-basic/tree/master/hooks

This is needed because the layer:leadership hooks are not up to date with layer:basic. They do not do "basic.init_config_states()", which causes "config.set.X" states to be removed after leader-elected runs.

[Stuart Bishop (stub)]

Thanks for catching this. Looks good.

review: Approve

diff --git a/hooks/leader-elected b/hooks/leader-elected
deleted file mode 100755
index fe39f65..0000000
--- a/hooks/leader-elected
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python3
-
-# Load modules from $CHARM_DIR/lib
-import sys
-sys.path.append('lib')
-
-from charms.layer.basic import bootstrap_charm_deps
-bootstrap_charm_deps()
-
-
-# This will load and run the appropriate @hook and other decorated
-# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
-# and $CHARM_DIR/hooks/relations.
-#
-# See https://jujucharms.com/docs/stable/authors-charm-building
-# for more information on this pattern.
-from charms.reactive import main
-main()
diff --git a/hooks/leader-settings-changed b/hooks/leader-settings-changed
deleted file mode 100755
index fe39f65..0000000
--- a/hooks/leader-settings-changed
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python3
-
-# Load modules from $CHARM_DIR/lib
-import sys
-sys.path.append('lib')
-
-from charms.layer.basic import bootstrap_charm_deps
-bootstrap_charm_deps()
-
-
-# This will load and run the appropriate @hook and other decorated
-# handlers from $CHARM_DIR/reactive, $CHARM_DIR/hooks/reactive,
-# and $CHARM_DIR/hooks/relations.
-#
-# See https://jujucharms.com/docs/stable/authors-charm-building
-# for more information on this pattern.
-from charms.reactive import main
-main()