Merge ~hloeung/influxdb-charm:master into influxdb-charm:master

[Haw Loeung]

Revert 3a3394e0c33003e208a4096f13c61bcc49b356ec

Thought splitting into a different state would trigger a different reactive run but that is not the case.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Paul Gear (paulgear)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 61b0843ca2a40871f6c2e37db7b7e068b5c9ebae

diff --git a/reactive/influxdb.py b/reactive/influxdb.py
index 985576c..0502220 100644
--- a/reactive/influxdb.py
+++ b/reactive/influxdb.py
@@ -38,7 +38,7 @@ def configure_website(website):
     website.configure(port=port)
 
 
-@when_not('influxdb.installed')
+@when_not('influxdb.configured')
 @when('apt.installed.influxdb')
 def install_influx():
     config = hookenv.config()
@@ -47,6 +47,9 @@ def install_influx():
     hookenv.open_port(port)
     config_changed()
     host.service_start('influxdb')
+    hookenv.status_set('active', '')
+    set_state('influxdb.configured')
+    set_state('config.changed')
     # This is a hack because the CLI shell tool is packaged differently in
     # upstream and Debian/Ubuntu. Upstream has no 'influxdb-client' package.
     try:
@@ -57,18 +60,12 @@ def install_influx():
     # python3-influxdb only exists in Ubuntu Xenial and beyond - LP: #1732015.
     if series not in ('precise', 'trusty'):
         apt_install('python3-influxdb')
-    remove_state('influxdb.configured')
-    set_state('influxdb.installed')
-
-
-@when_not('influxdb.configured')
-@when('influxdb.installed')
-def configure_influxdb():
+        # Yes, this is gross, but we're going to need it shortly.
+        global have_influxdbclient, influxdb
+        import influxdb
+        have_influxdbclient = True
     if have_influxdbclient:
         configure_influxdb_auth()
-    hookenv.status_set('active', '')
-    set_state('influxdb.configured')
-    set_state('config.changed')
 
 
 def configure_influxdb_auth():
@@ -217,7 +214,7 @@ def upgrade_charm():
             else:
                 raise
 
-    remove_state('influxdb.installed')
+    remove_state('influxdb.configured')
     set_state('config.changed.backup_dir')
     # If we have an NRPE relation, force run of that as well
     if hookenv.relation_ids('nrpe-exteral-master'):