Merge lp:~ivoks/charms/trusty/neutron-api-contrail/remove-running-services into lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk

[Ante Karamatić]

No need on installing a package that pulls in almost all Contrail services. We can easily use python library to compare Contrail versions.

[Robert Ayres (robert-ayres)]

review: Approve

=== modified file 'hooks/neutron_api_contrail_hooks.py'
--- hooks/neutron_api_contrail_hooks.py	2016-05-19 03:29:07 +0000
+++ hooks/neutron_api_contrail_hooks.py	2016-09-05 15:41:40 +0000
@@ -31,7 +31,7 @@
     write_plugin_config
 )
 
-PACKAGES = [ "neutron-plugin-contrail", "contrail-config-openstack" ]
+PACKAGES = [ "neutron-plugin-contrail" ]
 
 hooks = Hooks()
 config = config()

=== modified file 'hooks/neutron_api_contrail_utils.py'
--- hooks/neutron_api_contrail_utils.py	2016-05-07 02:33:48 +0000
+++ hooks/neutron_api_contrail_utils.py	2016-09-05 15:41:40 +0000
@@ -20,7 +20,7 @@
     except CalledProcessError:
         return None
 
-CONTRAIL_VERSION = dpkg_version("contrail-config-openstack")
+CONTRAIL_VERSION = dpkg_version("python-contrail")
 OPENSTACK_VERSION = dpkg_version("neutron-server")
 
 def contrail_api_ctx():