Merge ~paulgear/influxdb-charm/+git/influxdb-charm:master into influxdb-charm:master

[Paul Gear]

[Haw Loeung (hloeung)]

LGTM, +1

review: Approve

diff --git a/layer.yaml b/layer.yaml
index fec7bfa..37d19f1 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -1,4 +1,4 @@
-repo: https://github.com/ChrisMacNaughton/charm-influx
+repo: https://git.launchpad.net/influxdb-charm
 includes:
   - layer:basic
   - layer:apt
diff --git a/reactive/influxdb.py b/reactive/influxdb.py
index 126258b..56e7a22 100644
--- a/reactive/influxdb.py
+++ b/reactive/influxdb.py
@@ -2,9 +2,8 @@ from charmhelpers.core import hookenv
 from charmhelpers.core.host import service_start, service_stop
 from charmhelpers.core.templating import render
 from charms.reactive import when, when_not
-from charms.reactive import set_state, remove_state
+from charms.reactive import set_state
 
-from subprocess import check_call, CalledProcessError
 
 @when('admin.available')
 def configure_website(website):
@@ -12,43 +11,47 @@ def configure_website(website):
     port = config.get('bind_port')
     website.configure(port=port)
 
+
 @when_not('influxdb.configured')
 @when('apt.installed.influxdb')
 def install_influx():
-  config = hookenv.config()
-  port = config.get('bind_port')
-  hookenv.open_port(8083)
-  hookenv.open_port(port)
-  config_changed()
-  service_start('influxdb')
-  hookenv.status_set('active', '')
-  set_state('influxdb.configured')
+    config = hookenv.config()
+    port = config.get('bind_port')
+    hookenv.open_port(8083)
+    hookenv.open_port(port)
+    config_changed()
+    service_start('influxdb')
+    hookenv.status_set('active', '')
+    set_state('influxdb.configured')
+
 
 @when('config.changed')
 def config_changed():
-  config = hookenv.config()
-  port = config.get('bind_port')
-  ip_address = config.get('ip_address')
-  render(source='influxdb.conf',
-         target='/etc/influxdb/influxdb.conf',
-         owner='root',
-         perms=0o644,
-         context={
-             'admin': 'true',
-             'bind_port': port,
-             'ip_address': ip_address,
-         })
-  service_stop('influxdb')
-  service_start('influxdb')
+    config = hookenv.config()
+    port = config.get('bind_port')
+    ip_address = config.get('ip_address')
+    render(source='influxdb.conf',
+           target='/etc/influxdb/influxdb.conf',
+           owner='root',
+           perms=0o644,
+           context={
+               'admin': 'true',
+               'bind_port': port,
+               'ip_address': ip_address,
+           })
+    service_stop('influxdb')
+    service_start('influxdb')
+
 
 @when('query.api.available')
 def query_available(query):
-  config = hookenv.config()
-  port = config.get('bind_port')
-  query.configure(port=port)
+    config = hookenv.config()
+    port = config.get('bind_port')
+    query.configure(port=port)
+
 
 @when('grafana-source.available')
 def configure_grafana(grafana):
-  config = hookenv.config()
-  port = config.get('bind_port')
-  grafana.provide('influxdb', port, 'Juju generated source')
+    config = hookenv.config()
+    port = config.get('bind_port')
+    grafana.provide('influxdb', port, 'Juju generated source')