Merge ~cjwatson/layer-coordinator:config-flags into layer-coordinator:master

[Colin Watson]

Update hooks to handle setting config flags

This brings us up to date with changes to `layer-basic`:

  https://github.com/juju-solutions/layer-basic/commit/92e91d9f81414edf97fc642ffc51ae2cd763b43b
  https://github.com/juju-solutions/layer-basic/commit/a341618dd6035a86350bd3623aa31a3680859650
  https://github.com/juju-solutions/layer-basic/commit/aaf47539e6c040b40fa6311ecc2adf61857ff8f2

Unmerged commits

9698fee... by Colin Watson on 2023-04-18

Update hooks to handle setting config flags

This brings us up to date with changes to `layer-basic`:

  https://github.com/juju-solutions/layer-basic/commit/92e91d9f81414edf97fc642ffc51ae2cd763b43b
  https://github.com/juju-solutions/layer-basic/commit/a341618dd6035a86350bd3623aa31a3680859650
  https://github.com/juju-solutions/layer-basic/commit/aaf47539e6c040b40fa6311ecc2adf61857ff8f2

diff --git a/hooks/coordinator-relation-changed b/hooks/coordinator-relation-changed
index fe39f65..9858c6b 100755
--- a/hooks/coordinator-relation-changed
+++ b/hooks/coordinator-relation-changed
@@ -1,18 +1,22 @@
 #!/usr/bin/env python3
 
-# Load modules from $CHARM_DIR/lib
+# Load modules from $JUJU_CHARM_DIR/lib
 import sys
 sys.path.append('lib')
 
-from charms.layer.basic import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic  # noqa
+basic.bootstrap_charm_deps()
+
+from charmhelpers.core import hookenv  # noqa
+hookenv.atstart(basic.init_config_states)
+hookenv.atexit(basic.clear_config_states)
 
 
 # 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.
+# handlers from $JUJU_CHARM_DIR/reactive, $JUJU_CHARM_DIR/hooks/reactive,
+# and $JUJU_CHARM_DIR/hooks/relations.
 #
 # See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
-from charms.reactive import main
+from charms.reactive import main  # noqa
 main()
diff --git a/hooks/coordinator-relation-departed b/hooks/coordinator-relation-departed
index fe39f65..9858c6b 100755
--- a/hooks/coordinator-relation-departed
+++ b/hooks/coordinator-relation-departed
@@ -1,18 +1,22 @@
 #!/usr/bin/env python3
 
-# Load modules from $CHARM_DIR/lib
+# Load modules from $JUJU_CHARM_DIR/lib
 import sys
 sys.path.append('lib')
 
-from charms.layer.basic import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic  # noqa
+basic.bootstrap_charm_deps()
+
+from charmhelpers.core import hookenv  # noqa
+hookenv.atstart(basic.init_config_states)
+hookenv.atexit(basic.clear_config_states)
 
 
 # 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.
+# handlers from $JUJU_CHARM_DIR/reactive, $JUJU_CHARM_DIR/hooks/reactive,
+# and $JUJU_CHARM_DIR/hooks/relations.
 #
 # See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
-from charms.reactive import main
+from charms.reactive import main  # noqa
 main()
diff --git a/hooks/leader-elected b/hooks/leader-elected
index fe39f65..9858c6b 100755
--- a/hooks/leader-elected
+++ b/hooks/leader-elected
@@ -1,18 +1,22 @@
 #!/usr/bin/env python3
 
-# Load modules from $CHARM_DIR/lib
+# Load modules from $JUJU_CHARM_DIR/lib
 import sys
 sys.path.append('lib')
 
-from charms.layer.basic import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic  # noqa
+basic.bootstrap_charm_deps()
+
+from charmhelpers.core import hookenv  # noqa
+hookenv.atstart(basic.init_config_states)
+hookenv.atexit(basic.clear_config_states)
 
 
 # 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.
+# handlers from $JUJU_CHARM_DIR/reactive, $JUJU_CHARM_DIR/hooks/reactive,
+# and $JUJU_CHARM_DIR/hooks/relations.
 #
 # See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
-from charms.reactive import main
+from charms.reactive import main  # noqa
 main()
diff --git a/hooks/leader-settings-changed b/hooks/leader-settings-changed
index fe39f65..9858c6b 100755
--- a/hooks/leader-settings-changed
+++ b/hooks/leader-settings-changed
@@ -1,18 +1,22 @@
 #!/usr/bin/env python3
 
-# Load modules from $CHARM_DIR/lib
+# Load modules from $JUJU_CHARM_DIR/lib
 import sys
 sys.path.append('lib')
 
-from charms.layer.basic import bootstrap_charm_deps
-bootstrap_charm_deps()
+from charms.layer import basic  # noqa
+basic.bootstrap_charm_deps()
+
+from charmhelpers.core import hookenv  # noqa
+hookenv.atstart(basic.init_config_states)
+hookenv.atexit(basic.clear_config_states)
 
 
 # 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.
+# handlers from $JUJU_CHARM_DIR/reactive, $JUJU_CHARM_DIR/hooks/reactive,
+# and $JUJU_CHARM_DIR/hooks/relations.
 #
 # See https://jujucharms.com/docs/stable/authors-charm-building
 # for more information on this pattern.
-from charms.reactive import main
+from charms.reactive import main  # noqa
 main()