From cb6bd79d897e76409244f617c6f9bd077b73ab3a Mon Sep 17 00:00:00 2001
From: Michael Skalka <michael.skalka@canonical.com>
Date: Mon, 30 Jul 2018 11:00:32 -0400
Subject: [PATCH] more cleanup, moved subordinate out of venv, fixed an import
 and misspelling

---
 src/layer.yaml                            | 3 +++
 src/lib/charm/openstack/neutron_arista.py | 4 +---
 src/reactive/neutron_arista_handlers.py   | 6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/layer.yaml b/src/layer.yaml
index b36fbb8..79bf668 100644
--- a/src/layer.yaml
+++ b/src/layer.yaml
@@ -1,3 +1,6 @@
 includes:
 - 'layer:openstack'
 - 'interface:neutron-plugin-api-subordinate'
+options:
+  basic:
+    use_venv: False
diff --git a/src/lib/charm/openstack/neutron_arista.py b/src/lib/charm/openstack/neutron_arista.py
index 301fd5a..f1095ab 100644
--- a/src/lib/charm/openstack/neutron_arista.py
+++ b/src/lib/charm/openstack/neutron_arista.py
@@ -8,9 +8,6 @@ from charmhelpers.core.hookenv import (
     config,
     log,
     status_set,
-    is_leader,
-    leader_get,
-    leader_set,
 )
 import charms_openstack.charm
 
@@ -43,6 +40,7 @@ class NeutronAristaCharm(charms_openstack.charm.OpenStackCharm):
     def install(self):
         package_version = config('arista-version')
         package_name = 'networking-arista==%s' % package_version
+        log('Installing {}'.format(package_name))
         pip_install(package_name, fatal=True)
         status_set('active', 'Unit is ready')
 
diff --git a/src/reactive/neutron_arista_handlers.py b/src/reactive/neutron_arista_handlers.py
index 177d441..7382135 100644
--- a/src/reactive/neutron_arista_handlers.py
+++ b/src/reactive/neutron_arista_handlers.py
@@ -14,12 +14,14 @@
 
 import charms.reactive as reactive
 
+from charmhelpers.core.hookenv import (
+    config,
+)
 from charms_openstack.charm import (
     provide_charm_instance,
     use_defaults,
 )
 import charm.openstack.neutron_arista as arista  # noqa
-
 from charm.openstack.neutron_arista import register_configs
 
 CONFIGS = register_configs()
@@ -37,7 +39,7 @@ def install_neutron_arista():
 @reactive.when('neutron-plugin-api-subordinate.connected')
 @reactive.when('neutron-arista.installed')
 def configure_principle(api_principle):
-    injet_config = {
+    inject_config = {
         'neutron-api': {
             '/etc/neutron/neutron.conf': {
                 'sections': {