Merge lp:~junaidali/charms/trusty/plumgrid-gateway/oil-sapi-changes into lp:charms/trusty/plumgrid-gateway

[Junaid Ali]

[Junaid Ali (junaidali)]

Added charm series in metadata.yaml file
Solutions API support - PG ONS 6.X.X
Updated readme file
Wrapper to deal with Ubuntu versions don't have py2 installed
Improved get_mgmt method

[lp:~junaidali/charms/trusty/plumgrid-gateway/oil-sapi-changes]

20. By Junaid Ali on 2016-10-17

Changes:
  Added charm series in metadata.yaml file
  Solutions API support - PG ONS 6.X.X
  Updated readme file
  Wrapper to deal with Ubuntu versions don't have py2 installed
  Improved get_mgmt method

Unmerged revisions

20. By Junaid Ali on 2016-10-17

Changes:
  Added charm series in metadata.yaml file
  Solutions API support - PG ONS 6.X.X
  Updated readme file
  Wrapper to deal with Ubuntu versions don't have py2 installed
  Improved get_mgmt method

19. By Junaid Ali on 2016-10-15

Changes:
  Added charm series in metadata.yaml file
  Solutions API support - PG ONS 6.X.X
  Updated readme file
  Wrapper to deal with Ubuntu versions don't have py2 installed
  Improved get_mgmt method

18. By Junaid Ali on 2016-10-15

Changes:
  Added charm series in metadata.yaml file
  Solutions API support - PG ONS 6.X.X
  Updated readme file
  Wrapper to deal with Ubuntu versions don't have py2 installed
  Improved get_mgmt method

=== modified file 'README.md'
--- README.md	2016-04-15 11:05:58 +0000
+++ README.md	2016-10-17 17:45:27 +0000
@@ -29,7 +29,7 @@
 
 ## Known Limitations and Issues
 
-This is an early access version of the PLUMgrid Gateway charm and it is not meant for production deployments. The charm currently only supports Kilo Openstack Release.
+This is an early access version of the PLUMgrid Gateway charm for testing with xenial and it is not meant for production deployments.
 
 # Configuration
 
@@ -61,4 +61,5 @@
 # Contact Information
 
 Bilal Baqar <[e-mail]>
-Bilal Ahmad <[e-mail]>
+Javeria Khan <[e-mail]>
+Junaid Ali <[e-mail]>
 
=== modified file 'config.yaml'
--- config.yaml	2016-07-25 17:01:44 +0000
+++ config.yaml	2016-10-17 17:45:27 +0000
@@ -11,6 +11,7 @@
     description: Public SSH key of PLUMgrid LCM which is running PG-Tools
   mgmt-interface:
     type: string
+    default:
     description: The interface connected to PLUMgrid Managment network.
   fabric-interfaces:
     default: 'MANAGEMENT'
 
=== modified symlink 'hooks/install' (properties changed: -x to +x)
=== target was u'pg_gw_hooks.py'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2016-10-17 17:45:27 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+# Wrapper to deal with newer Ubuntu versions that don't have py2 installed
+# by default.
+
+declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml')
+
+check_and_install() {
+    pkg="${1}-${2}"
+    if ! dpkg -s ${pkg} 2>&1 > /dev/null; then
+        apt-get -y install ${pkg}
+    fi
+}
+
+PYTHON="python"
+
+for dep in ${DEPS[@]}; do
+    check_and_install ${PYTHON} ${dep}
+done
+
+exec ./hooks/install.real
 
=== added symlink 'hooks/install.real'
=== target is u'pg_gw_hooks.py'
=== modified file 'hooks/pg_gw_hooks.py'
--- hooks/pg_gw_hooks.py	2016-08-29 09:43:59 +0000
+++ hooks/pg_gw_hooks.py	2016-10-17 17:45:27 +0000
@@ -33,24 +33,23 @@
     fabric_interface_changed,
     load_iptables,
     restart_on_change,
+    restart_pg,
     restart_on_stop,
     director_cluster_ready,
     configure_pg_sources,
-    docker_configure_sources
 )
 
 hooks = Hooks()
 CONFIGS = register_configs()
 
 
[e-mail]()
[e-mail]('install.real')
 def install():
     '''
     Install hook is run when the charm is first deployed on a node.
     '''
     status_set('maintenance', 'Executing pre-install')
     load_iptables()
-    docker_configure_sources()
     configure_sources(update=True)
     status_set('maintenance', 'Installing apt packages')
     pkgs = determine_packages()
@@ -72,6 +71,7 @@
     if director_cluster_ready():
         ensure_mtu()
         CONFIGS.write_all()
+        restart_pg()
 
 
 @hooks.hook('config-changed')
@@ -105,6 +105,7 @@
             load_iovisor()
     ensure_mtu()
     CONFIGS.write_all()
+    restart_pg()
 
 
 @hooks.hook('upgrade-charm')
 
=== modified file 'hooks/pg_gw_utils.py'
--- hooks/pg_gw_utils.py	2016-08-29 09:43:59 +0000
+++ hooks/pg_gw_utils.py	2016-10-17 17:45:27 +0000
@@ -23,6 +23,8 @@
     get_iface_from_addr,
     get_bridges,
     get_bridge_nics,
+    get_iface_addr,
+    get_host_ip
 )
 from charmhelpers.core.host import (
     write_file,
@@ -77,6 +79,12 @@
     }),
 ])
 
+# Docker-engine version mapping - for OIL local repo
+DOCKER_ENGINE_VERSION = {
+    'trusty': '1.12.2-0~trusty',
+    'xenial': '1.12.2-0~xenial'
+}
+
 
 def configure_pg_sources():
     '''
@@ -101,7 +109,8 @@
     '''
     pkgs = []
     pkgs.extend(docker_dependencies())
-    pkgs.append('docker-engine')
+    pkgs.append('docker-engine=%s' %
+                DOCKER_ENGINE_VERSION[lsb_release()['DISTRIB_CODENAME']])
     tag = 'latest'
     for pkg in neutron_plugin_attribute('plumgrid', 'packages', 'neutron'):
         if 'plumgrid' in pkg:
@@ -138,19 +147,17 @@
     ubuntu_rel = lsb_release()['DISTRIB_CODENAME']
     DOCKER_SOURCE = ('deb https://apt.dockerproject.org/repo ubuntu-%s'
                      ' main')
-    cmd = ('apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80'
-           ' --recv-keys 58118E89F3A912897C070ADBF76221572C52609D')
-    log('Importing GPG for docker engine')
-    try:
-        subprocess.check_call(cmd, shell=True)
-    except:
-        raise ValueError('Error importing docker GPG Key')
+    log('Importing GPG Key for docker engine')
+    _exec_cmd(['apt-key', 'adv', '--keyserver',
+               'hkp://p80.pool.sks-keyservers.net:80',
+               '--recv-keys', '58118E89F3A912897C070ADBF76221572C52609D'])
     try:
         with open('/etc/apt/sources.list.d/docker.list', 'w') as f:
             f.write(DOCKER_SOURCE % ubuntu_rel)
         f.close()
     except:
-        log('Unable to update /etc/apt/sources.list.d/docker.list')
+        raise ValueError('Unable to update /etc/apt/sources.list.d/'
+                         'docker.list')
 
 
 def register_configs(release=None):
@@ -201,16 +208,16 @@
     service_start('plumgrid')
     time.sleep(3)
     if not service_running('plumgrid'):
-        if service_running('libvirt-bin'):
+        if service_running('docker-engine'):
             raise ValueError("plumgrid service couldn't be started")
         else:
-            if service_start('libvirt-bin'):
+            if service_start('docker-engine'):
                 time.sleep(8)
                 if not service_running('plumgrid') \
                         and not service_start('plumgrid'):
                     raise ValueError("plumgrid service couldn't be started")
             else:
-                raise ValueError("libvirt-bin service couldn't be started")
+                raise ValueError("docker-engine service couldn't be started")
     status_set('active', 'Unit is ready')
 
 
@@ -257,6 +264,13 @@
     '''
     mgmt_interface = config('mgmt-interface')
     if not mgmt_interface:
+        try:
+            return get_iface_from_addr(unit_get('private-address'))
+        except:
+            for bridge_interface in get_bridges():
+                if (get_host_ip(unit_get('private-address'))
+                        in get_iface_addr(bridge_interface)):
+                    return bridge_interface
         return get_iface_from_addr(unit_get('private-address'))
     elif interface_exists(mgmt_interface):
         return mgmt_interface
@@ -366,7 +380,7 @@
         try:
             fr = open(AUTH_KEY_PATH, 'r')
         except IOError:
-            log('plumgrid-lxc not installed yet')
+            log('plumgrid-docker package not installed yet')
             return 0
         for line in fr:
             if key in line:
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-07-29 18:23:55 +0000
+++ metadata.yaml	2016-10-17 17:45:27 +0000
@@ -7,6 +7,9 @@
   fabric to external IP networks (such as for internet access). The PLUMgrid
   Gateway can be deployed as a pair in Active/ Active mode for load balancing
   of traffic and high availability of external connectivity.
+series:
+  - xenial
+  - trusty
 tags:
   - openstack
 requires:
 
=== modified file 'unit_tests/test_pg_gw_hooks.py'
--- unit_tests/test_pg_gw_hooks.py	2016-08-29 09:43:59 +0000
+++ unit_tests/test_pg_gw_hooks.py	2016-10-17 17:45:27 +0000
@@ -31,7 +31,7 @@
     'load_iptables',
     'director_cluster_ready',
     'status_set',
-    'docker_configure_sources'
+    'restart_pg'
 ]
 NEUTRON_CONF_DIR = "/etc/neutron"