Merge lp:~bbaqar/charms/trusty/plumgrid-gateway/ip-sort into lp:~plumgrid-team/charms/trusty/plumgrid-gateway/trunk

[Bilal Baqar]

Sorted the director IPs and setting required iptables rules
Ticket: [CFB-829]

[lp:~bbaqar/charms/trusty/plumgrid-gateway/ip-sort]

19. By Bilal Baqar on 2016-03-14

Local commit

20. By Bilal Baqar on 2016-03-14

Adding restart in upgrade hook

[Abdullah Khan Wazir (abdullah-khan)]

review: Approve

=== modified file 'hooks/pg_gw_context.py'
--- hooks/pg_gw_context.py	2015-11-22 03:26:23 +0000
+++ hooks/pg_gw_context.py	2016-03-14 04:18:28 +0000
@@ -3,14 +3,17 @@
 # This file contains the class that generates context for
 # PLUMgrid template files.
 
+from charmhelpers.contrib.openstack import context
+from charmhelpers.contrib.openstack.utils import get_host_ip
 from charmhelpers.core.hookenv import (
     relation_ids,
     related_units,
     relation_get,
 )
-from charmhelpers.contrib.openstack import context
-from charmhelpers.contrib.openstack.utils import get_host_ip
-from socket import gethostname as get_unit_hostname
+from socket import (
+    gethostname,
+    getfqdn
+)
 
 
 def _pg_dir_settings():
@@ -60,7 +63,7 @@
             return {}
 
         pg_dir_ips = ''
-        pg_dir_settings = _pg_dir_settings()
+        pg_dir_settings = sorted(_pg_dir_settings())
         single_ip = True
         for ip in pg_dir_settings:
             if single_ip:
@@ -69,8 +72,9 @@
             else:
                 pg_dir_ips = pg_dir_ips + ',' + str(ip)
         pg_ctxt['local_ip'] = pg_dir_ips
-        unit_hostname = get_unit_hostname()
+        unit_hostname = gethostname()
         pg_ctxt['pg_hostname'] = unit_hostname
+        pg_ctxt['pg_fqdn'] = getfqdn()
         from pg_gw_utils import (
             get_mgmt_interface,
             get_gw_interfaces,
 
=== modified file 'hooks/pg_gw_hooks.py'
--- hooks/pg_gw_hooks.py	2015-11-22 03:26:23 +0000
+++ hooks/pg_gw_hooks.py	2016-03-14 04:18:28 +0000
@@ -30,7 +30,8 @@
     remove_iovisor,
     ensure_mtu,
     add_lcm_key,
-    fabric_interface_changed
+    fabric_interface_changed,
+    load_iptables,
 )
 
 hooks = Hooks()
@@ -42,6 +43,7 @@
     '''
     Install hook is run when the charm is first deployed on a node.
     '''
+    load_iptables()
     configure_sources(update=True)
     pkgs = determine_packages()
     for pkg in pkgs:
@@ -98,6 +100,15 @@
     restart_pg()
 
 
[e-mail]('upgrade-charm')
+def upgrade_charm():
+    load_iptables()
+    ensure_mtu()
+    ensure_files()
+    CONFIGS.write_all()
+    restart_pg()
+
+
 @hooks.hook('stop')
 def stop():
     '''
 
=== modified file 'hooks/pg_gw_utils.py'
--- hooks/pg_gw_utils.py	2015-11-22 03:26:23 +0000
+++ hooks/pg_gw_utils.py	2016-03-14 04:18:28 +0000
@@ -2,8 +2,18 @@
 
 # This file contains functions used by the hooks to deploy PLUMgrid Gateway.
 
+import pg_gw_context
+import subprocess
+import time
+import os
+import json
+from collections import OrderedDict
+from socket import gethostname as get_unit_hostname
+from copy import deepcopy
 from charmhelpers.contrib.openstack.neutron import neutron_plugin_attribute
-from copy import deepcopy
+from charmhelpers.contrib.storage.linux.ceph import modprobe
+from charmhelpers.core.host import set_nic_mtu
+from charmhelpers.contrib.openstack import templating
 from charmhelpers.core.hookenv import (
     log,
     config,
@@ -22,33 +32,22 @@
     service_stop,
 )
 from charmhelpers.fetch import (
-    apt_cache
+    apt_cache,
+    apt_install
 )
-from charmhelpers.contrib.storage.linux.ceph import modprobe
-from charmhelpers.core.host import set_nic_mtu
-from charmhelpers.contrib.openstack import templating
-from collections import OrderedDict
 from charmhelpers.contrib.openstack.utils import (
     os_release,
 )
-from socket import gethostname as get_unit_hostname
-import pg_gw_context
-import subprocess
-import time
-import os
-import json
 
 LXC_CONF = "/etc/libvirt/lxc.conf"
 TEMPLATES = 'templates/'
 PG_LXC_DATA_PATH = '/var/lib/libvirt/filesystems/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
 AUTH_KEY_PATH = '%s/root/.ssh/authorized_keys' % PG_LXC_DATA_PATH
 IFC_LIST_GW = '/var/run/plumgrid/lxc/ifc_list_gateway'
-
 SUDOERS_CONF = '/etc/sudoers.d/ifc_ctl_sudoers'
 
 BASE_RESOURCE_MAP = OrderedDict([
@@ -141,9 +140,7 @@
     '''
     Stops and Starts PLUMgrid service after flushing iptables.
     '''
-    service_stop('plumgrid')
-    time.sleep(30)
-    _exec_cmd(cmd=['iptables', '-F'])
+    stop_pg()
     service_start('plumgrid')
     time.sleep(30)
 
@@ -153,7 +150,7 @@
     Stops PLUMgrid service.
     '''
     service_stop('plumgrid')
-    time.sleep(2)
+    time.sleep(30)
 
 
 def load_iovisor():
@@ -168,7 +165,7 @@
     Removes iovisor kernel module.
     '''
     _exec_cmd(cmd=['rmmod', 'iovisor'],
-              error_msg='Error Loading Iovisor Kernel Module')
+              error_msg='Error Removing IOVisor Kernel Module')
     time.sleep(1)
 
 
@@ -327,3 +324,48 @@
     fa.write('\n')
     fa.close()
     return 1
+
+
+def load_iptables():
+    '''
+    Loads iptables rules to allow all PLUMgrid communication.
+    '''
+    network = get_cidr_from_iface(get_mgmt_interface())
+    if network:
+        _exec_cmd(['sudo', 'iptables', '-A', 'INPUT', '-p', 'tcp',
+                   '-j', 'ACCEPT', '-s', network, '-d',
+                   network, '-m', 'state', '--state', 'NEW'])
+        _exec_cmd(['sudo', 'iptables', '-A', 'INPUT', '-p', 'udp', '-j',
+                   'ACCEPT', '-s', network, '-d', network,
+                   '-m', 'state', '--state', 'NEW'])
+        apt_install('iptables-persistent')
+
+
+def get_cidr_from_iface(interface):
+    '''
+    Determines Network CIDR from interface.
+    '''
+    if not interface:
+        return None
+    apt_install('ohai')
+    try:
+        os_info = subprocess.check_output(['ohai', '-l', 'fatal'])
+    except OSError:
+        log('Unable to get operating system information')
+        return None
+    try:
+        os_info_json = json.loads(os_info)
+    except ValueError:
+        log('Unable to determine network')
+        return None
+    device = os_info_json['network']['interfaces'].get(interface)
+    if device is not None:
+        if device.get('routes'):
+            routes = device['routes']
+            for net in routes:
+                if 'scope' in net:
+                    return net.get('destination')
+        else:
+            return None
+    else:
+        return None
 
=== added symlink 'hooks/upgrade-charm'
=== target is u'pg_gw_hooks.py'
=== modified file 'templates/kilo/hosts'
--- templates/kilo/hosts	2015-07-29 18:23:55 +0000
+++ templates/kilo/hosts	2016-03-14 04:18:28 +0000
@@ -1,5 +1,5 @@
 127.0.0.1   localhost
-127.0.1.1   {{ pg_hostname }}
+127.0.1.1   {{ pg_fqdn }}   {{ pg_hostname }}
 
 # The following lines are desirable for IPv6 capable hosts
 ::1     ip6-localhost ip6-loopback
 
=== modified file 'unit_tests/test_pg_gw_context.py'
--- unit_tests/test_pg_gw_context.py	2015-11-22 03:26:23 +0000
+++ unit_tests/test_pg_gw_context.py	2016-03-14 04:18:28 +0000
@@ -5,7 +5,8 @@
 import charmhelpers
 
 TO_PATCH = [
-    'get_unit_hostname',
+    'gethostname',
+    'getfqdn'
 ]
 
 
@@ -55,7 +56,8 @@
         _npa.side_effect = mock_npa
         _unit_get.return_value = '192.168.100.201'
         _unit_priv_ip.return_value = '192.168.100.201'
-        self.get_unit_hostname.return_value = 'node0'
+        self.gethostname.return_value = 'node0'
+        self.getfqdn.return_value = 'node0'
         _is_clus.return_value = False
         _config_flag.return_value = False
         _pg_dir_settings.return_value = {'pg_dir_ip': '192.168.100.201'}
@@ -73,6 +75,7 @@
             'neutron_security_groups': None,
             'neutron_url': 'https://192.168.100.201:9696',
             'pg_hostname': 'node0',
+            'pg_fqdn': 'node0',
             'interface': 'juju-br0',
             'fabric_interface': 'juju-br0',
             'label': 'node0',
 
=== modified file 'unit_tests/test_pg_gw_hooks.py'
--- unit_tests/test_pg_gw_hooks.py	2016-03-03 21:49:53 +0000
+++ unit_tests/test_pg_gw_hooks.py	2016-03-14 04:18:28 +0000
@@ -30,6 +30,7 @@
     'ensure_mtu',
     'add_lcm_key',
     'determine_packages',
+    'load_iptables'
 ]
 NEUTRON_CONF_DIR = "/etc/neutron"