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

[Junaid Ali]

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5471/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5572/

review: Needs Fixing (automated testing)

=== modified file 'config.yaml'
--- config.yaml	2015-11-22 03:26:23 +0000
+++ config.yaml	2016-08-29 12:05:09 +0000
@@ -11,24 +11,13 @@
     description: Public SSH key of PLUMgrid LCM which is running PG-Tools
   mgmt-interface:
     type: string
-    default: 'juju-br0'
     description: The interface connected to PLUMgrid Managment network.
-  os-data-network:
-    type: string
-    default:
-    description: |
-      The IP address and netmask of the OpenStack Data network (e.g.,
-      192.168.0.0/24)
-      .
-      This network will be used for tenant network traffic in overlay
-      networks.
   fabric-interfaces:
     default: 'MANAGEMENT'
     type: string
     description: |
        Interfaces that will provide fabric connectivity on the gateway nodes.
-       Provided in form of json in a string. These interfaces have to be connected 
-       to the os-data-network specified in the config. Default value is MANAGEMENT which
+       Provided in form of json in a string. Default value is MANAGEMENT which
        will configure the management interface as the fabric interface on each
        director.
   network-device-mtu:

=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
--- hooks/charmhelpers/contrib/openstack/neutron.py	2016-04-22 08:15:33 +0000
+++ hooks/charmhelpers/contrib/openstack/neutron.py	2016-08-29 12:05:09 +0000
@@ -204,7 +204,7 @@
                                         database=config('database'),
                                         ssl_dir=NEUTRON_CONF_DIR)],
             'services': [],
-            'packages': ['plumgrid-lxc',
+            'packages': ['plumgrid-edge-docker',
                          'iovisor-dkms'],
             'server_packages': ['neutron-server',
                                 'neutron-plugin-plumgrid'],

=== modified file 'hooks/pg_gw_hooks.py'
--- hooks/pg_gw_hooks.py	2016-04-06 16:45:27 +0000
+++ hooks/pg_gw_hooks.py	2016-08-29 12:05:09 +0000
@@ -34,7 +34,9 @@
     load_iptables,
     restart_on_change,
     restart_on_stop,
-    director_cluster_ready
+    director_cluster_ready,
+    configure_pg_sources,
+    docker_configure_sources
 )
 
 hooks = Hooks()
@@ -48,6 +50,7 @@
     '''
     status_set('maintenance', 'Executing pre-install')
     load_iptables()
+    docker_configure_sources()
     configure_sources(update=True)
     status_set('maintenance', 'Installing apt packages')
     pkgs = determine_packages()
@@ -92,6 +95,8 @@
             charm_config.changed('iovisor-build')):
         stop_pg()
         status_set('maintenance', 'Upgrading apt packages')
+        if charm_config.changed('install_sources'):
+            configure_pg_sources()
         configure_sources(update=True)
         pkgs = determine_packages()
         for pkg in pkgs:

=== modified file 'hooks/pg_gw_utils.py'
--- hooks/pg_gw_utils.py	2016-05-01 02:22:48 +0000
+++ hooks/pg_gw_utils.py	2016-08-29 12:05:09 +0000
@@ -23,8 +23,6 @@
     get_iface_from_addr,
     get_bridges,
     get_bridge_nics,
-    is_address_in_network,
-    get_iface_addr
 )
 from charmhelpers.core.host import (
     write_file,
@@ -32,7 +30,8 @@
     service_stop,
     service_running,
     path_hash,
-    set_nic_mtu
+    set_nic_mtu,
+    lsb_release
 )
 from charmhelpers.fetch import (
     apt_cache,
@@ -42,16 +41,17 @@
     os_release,
 )
 
+SOURCES_LIST = '/etc/apt/sources.list'
 LXC_CONF = "/etc/libvirt/lxc.conf"
 TEMPLATES = 'templates/'
-PG_LXC_DATA_PATH = '/var/lib/libvirt/filesystems/plumgrid-data'
+PG_LXC_DATA_PATH = '/var/lib/plumgrid/plumgrid-data'
 PG_CONF = '%s/conf/pg/plumgrid.conf' % PG_LXC_DATA_PATH
 PG_HN_CONF = '%s/conf/etc/hostname' % PG_LXC_DATA_PATH
 PG_HS_CONF = '%s/conf/etc/hosts' % PG_LXC_DATA_PATH
 PG_IFCS_CONF = '%s/conf/pg/ifcs.conf' % PG_LXC_DATA_PATH
 OPS_CONF = '%s/conf/etc/00-pg.conf' % PG_LXC_DATA_PATH
 AUTH_KEY_PATH = '%s/root/.ssh/authorized_keys' % PG_LXC_DATA_PATH
-IFC_LIST_GW = '/var/run/plumgrid/lxc/ifc_list_gateway'
+IFC_LIST_GW = '/var/run/plumgrid/ifc_list_gateway'
 SUDOERS_CONF = '/etc/sudoers.d/ifc_ctl_sudoers'
 
 BASE_RESOURCE_MAP = OrderedDict([
@@ -78,12 +78,30 @@
 ])
 
 
+def configure_pg_sources():
+    '''
+    Returns true if install sources is updated in sources.list file
+    '''
+    try:
+        with open(SOURCES_LIST, 'r+') as sources:
+            all_lines = sources.readlines()
+            sources.seek(0)
+            for i in (line for line in all_lines if "plumgrid" not in line):
+                sources.write(i)
+            sources.truncate()
+        sources.close()
+    except IOError:
+        log('Unable to update /etc/apt/sources.list')
+
+
 def determine_packages():
     '''
     Returns list of packages required by PLUMgrid Gateway as specified
     in the neutron_plugins dictionary in charmhelpers.
     '''
     pkgs = []
+    pkgs.extend(docker_dependencies())
+    pkgs.append('docker-engine')
     tag = 'latest'
     for pkg in neutron_plugin_attribute('plumgrid', 'packages', 'neutron'):
         if 'plumgrid' in pkg:
@@ -104,6 +122,37 @@
     return pkgs
 
 
+def docker_dependencies():
+    '''
+    Returns a list of packages to be installed for docker engine
+    '''
+    kver = subprocess.check_output(['uname', '-r']).replace('\n', '')
+    return ['apt-transport-https', 'ca-certificates', 'apparmor',
+            'linux-image-extra-{}'.format(kver)]
+
+
+def docker_configure_sources():
+    '''
+    Imports GPG key and updates apt source for docker engine
+    '''
+    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')
+    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')
+
+
 def register_configs(release=None):
     '''
     Returns an object of the Openstack Tempating Class which contains the
@@ -207,7 +256,9 @@
     Returns the managment interface.
     '''
     mgmt_interface = config('mgmt-interface')
-    if interface_exists(mgmt_interface):
+    if not mgmt_interface:
+        return get_iface_from_addr(unit_get('private-address'))
+    elif interface_exists(mgmt_interface):
         return mgmt_interface
     else:
         log('Provided managment interface %s does not exist'
@@ -251,11 +302,7 @@
         else:
             raise ValueError('No fabric interface provided for node')
         if interface_exists(node_fabric_interface):
-            if is_address_in_network(config('os-data-network'),
-                                     get_iface_addr(node_fabric_interface)[0]):
-                return node_fabric_interface
-            else:
-                raise ValueError('Fabric interface not in fabric network')
+            return node_fabric_interface
         else:
             log('Provided fabric interface %s does not exist'
                 % node_fabric_interface)
@@ -268,22 +315,12 @@
     Gateway node can have multiple interfaces. This function parses json
     provided in config to get all gateway interfaces for this node.
     '''
-    node_interfaces = []
-    try:
-        all_interfaces = json.loads(config('external-interfaces'))
-    except ValueError:
-        raise ValueError("Invalid json provided for gateway interfaces")
-    hostname = get_unit_hostname()
-    if hostname in all_interfaces:
-        node_interfaces = all_interfaces[hostname].split(',')
-    elif 'DEFAULT' in all_interfaces:
-        node_interfaces = all_interfaces['DEFAULT'].split(',')
-    for interface in node_interfaces:
-        if not interface_exists(interface):
-            log('Provided gateway interface %s does not exist'
-                % interface)
-            raise ValueError('Provided gateway interface does not exist')
-    return node_interfaces
+    interface = config('external-interfaces')
+    if not interface_exists(interface):
+        log('Provided gateway interface %s does not exist'
+            % interface)
+        raise ValueError('Provided gateway interface does not exist')
+    return interface
 
 
 def ensure_mtu():

=== modified file 'templates/kilo/00-pg.conf'
--- templates/kilo/00-pg.conf	2016-04-06 16:45:27 +0000
+++ templates/kilo/00-pg.conf	2016-08-29 12:05:09 +0000
@@ -1,2 +1,3 @@
 $template ls_json,"{{'{'}}{{'%'}}timestamp:::date-rfc3339,jsonf:@timestamp%,%source:::jsonf:@source_host%,%msg:::json%}"
-:syslogtag,isequal,"pg:" @{{ opsvm_ip }}:6000;ls_json
+if $syslogtag == 'pg:'  and not ($msg contains 'dht_cli_') then @{{ opsvm_ip }}:6000;ls_json
+:msg, contains, "VM Interface Stats" ~

=== modified file 'templates/kilo/ifcs.conf'
--- templates/kilo/ifcs.conf	2015-11-22 03:26:23 +0000
+++ templates/kilo/ifcs.conf	2016-08-29 12:05:09 +0000
@@ -1,7 +1,3 @@
 {{ fabric_interface }} = fabric_core host
-{% if ext_interfaces -%}
-{% for ip in ext_interfaces -%}
-{{ ip }} = access_phys
-{% endfor -%}
-{% endif -%}
+{{ ext_interfaces }} = access_phys
 

=== modified file 'templates/kilo/plumgrid.conf'
--- templates/kilo/plumgrid.conf	2016-03-27 15:24:34 +0000
+++ templates/kilo/plumgrid.conf	2016-08-29 12:05:09 +0000
@@ -5,6 +5,9 @@
 plumgrid_rsync_port=2222
 plumgrid_rest_addr=0.0.0.0:9180
 fabric_mode={{ fabric_mode }}
+plumgrid_syslog_ng_ip={{ plumgrid_syslog_ng_ip }}
+plumgrid_syslog_ng_port={{ plumgrid_syslog_ng_port }}
+plumgrid_monitor_interval={{ plumgrid_monitor_interval }}
 start_plumgrid_iovisor=yes
 start_plumgrid=`/opt/pg/scripts/pg_is_director.sh $plumgrid_ip`
 location=

=== modified file 'unit_tests/test_pg_gw_hooks.py'
--- unit_tests/test_pg_gw_hooks.py	2016-05-01 02:22:48 +0000
+++ unit_tests/test_pg_gw_hooks.py	2016-08-29 12:05:09 +0000
@@ -30,7 +30,8 @@
     'determine_packages',
     'load_iptables',
     'director_cluster_ready',
-    'status_set'
+    'status_set',
+    'docker_configure_sources'
 ]
 NEUTRON_CONF_DIR = "/etc/neutron"