Adding 6.0 features support

* Changes:

 - Added support for deb networking-plumgrid install
 - plumlib.ini changes

Signed-off-by: Junaid Ali <junaidali@plumgrid.com>

* Added config networking-build

Signed-off-by: Junaid Ali <junaidali@plumgrid.com>

* Upgrade networking-plumgrid package if networking-build
is changed

Signed-off-by: Junaid Ali <junaidali@plumgrid.com>

config.yaml

@@ -15,7 +15,12 @@ options:
     default: 'latest'
     type: string
     description: |
-       Provide the build version of PLUMgrid packages that needs to be installed
+       Provide the build version of plumgrid-pythonlib package that needs to be installed
+  networking-build:
+    default: 'latest'
+    type: string
+    description: |
+       Provide the build version of networking-plumgrid package that needs to be installed
   networking-plumgrid-version:
     default: null
     type: string

hooks/neutron_plumgrid_hooks.py

@@ -64,6 +64,7 @@ def config_changed():
     charm_config = config()
     if (charm_config.changed('install_sources') or
         charm_config.changed('plumgrid-build') or
+        charm_config.changed('networking-build') or
             charm_config.changed('install_keys')):
         status_set('maintenance', 'Upgrading apt packages')
         if charm_config.changed('install_sources'):

hooks/neutron_plumgrid_utils.py

@@ -28,7 +28,8 @@ from charmhelpers.contrib.openstack.utils import (
 TEMPLATES = 'templates/'
 
 PG_PACKAGES = [
-    'plumgrid-pythonlib'
+    'plumgrid-pythonlib',
+    'networking-plumgrid'
 ]
 
 NEUTRON_CONF_DIR = "/etc/neutron"
@@ -86,8 +87,14 @@ def determine_packages():
     enable PLUMgrid in Openstack.
     '''
     pkgs = []
-    tag = config('plumgrid-build')
+    tag = 'latest'
     for pkg in PG_PACKAGES:
+        if pkg == 'plumgrid-pythonlib':
+            tag = config('plumgrid-build')
+        elif (pkg == 'networking-plumgrid' and
+              config('enable-deb-networking-install')):
+            tag = config('networking-build')
+
         if tag == 'latest':
             pkgs.append(pkg)
         else: