addressing review comments

hooks/quantum_hooks.py

@@ -16,6 +16,7 @@ from charmhelpers.fetch import (
     apt_update,
     apt_install,
     filter_installed_packages,
+    apt_purge,
 )
 from charmhelpers.core.host import (
     restart_on_change,
@@ -97,10 +98,11 @@ def config_changed():
     if config('plugin') == 'n1kv':
         if config('enable-l3-agent'):
             if not service_running('neutron-l3-agent'):
+                apt_install('neutron-l3-agent')
                 service_start('neutron-l3-agent')
         else:
             if service_running('neutron-l3-agent'):
-                service_stop('neutron-l3-agent')
+                apt_purge('neutron-l3-agent')
 
 
 @hooks.hook('upgrade-charm')

hooks/quantum_utils.py

@@ -73,15 +73,12 @@ NEUTRON_ML2_PLUGIN_CONF = \
     "/etc/neutron/plugins/ml2/ml2_conf.ini"
 NEUTRON_NVP_PLUGIN_CONF = \
     "/etc/neutron/plugins/nicira/nvp.ini"
-NEUTRON_N1KV_PLUGIN_CONF = \
-    "/etc/neutron/plugins/cisco/cisco_plugins.ini"
 NEUTRON_NSX_PLUGIN_CONF = \
     "/etc/neutron/plugins/vmware/nsx.ini"
 
 NEUTRON_PLUGIN_CONF = {
     OVS: NEUTRON_OVS_PLUGIN_CONF,
     NVP: NEUTRON_NVP_PLUGIN_CONF,
-    N1KV: NEUTRON_N1KV_PLUGIN_CONF,
     NSX: NEUTRON_NSX_PLUGIN_CONF,
 }
 

templates/havana/cisco_plugins.ini

@@ -1,44 +0,0 @@
-[CISCO_PLUGINS]
-vswitch_plugin=neutron.plugins.cisco.n1kv.n1kv_neutron_plugin.N1kvNeutronPluginV2
-
-[database]
-{% if database_host -%}
-connection = mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}
-{% else -%}
-connection = sqlite:////var/lib/neutron/neutron.sqlite
-{% endif -%}
-#sql_connection = mysql://quantum:quantum_pass@127.0.0.1/quantum?charset=utf8
-# Replace 127.0.0.1 above with the IP address of the database used by the
-# main quantum server. (Leave it as is if the database runs on this host.)
-#sql_connection=engine://user:pass@host/db_name
-#mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}
-#mysql://{{ quantum_user }}:{{ quantum_password }}@{{ database_host }}/{{ quantum_db }}?charset=utf8
-#reconnect_interval = 2
-
-[N1KV: {{ vsm_ip }} ]
-username= {{ vsm_username }}
-password= {{ vsm_password }}
-
-[cisco_n1kv]
-integration_bridge=br-int
-#enable_tunneling=True
-tunnel_bridge=br-int
-local_ip= {{ local_ip }}
-tenant_network_type=local
-#bridge_mappings=
-#vxlan_id_ranges=5000:60000
-#network_vlan_ranges=vlan:1:4095
-# IMPORTANT: Comment out the following two lines for production deployments
-default_policy_profile=havana_pp
-network_node_policy_profile = dhcp_pp
-poll_duration = 10
-
-#[CISCO_TEST]
-#host=testhost
-
-#[DRIVER]
-#name=quantum.plugins.cisco.tests.unit.v2.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver
-
-#[AGENT]
-#polling_interval = 10
-#root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf

templates/havana/dhcp_agent.ini

@@ -19,7 +19,6 @@ enable_isolated_metadata = True
 {% if plugin == 'n1kv' %}
 enable_metadata_network = True
 enable_isolated_metadata = True
-debug = False
 resync_interval = 30
 use_namespaces = True
 dhcp_lease_time=3600

templates/havana/l3_agent.ini

@@ -16,8 +16,6 @@ l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport
 external_network_bridge = br-int
 ovs_use_veth = False
 use_namespaces = True
-debug = True
-verbose = True
 {% else %}
 ovs_use_veth = True
 {% endif %}