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

[Bilal Baqar]

Sorted the director IPs.
Ticket: [CFB-829]

[Nabeel Afzal (nabeel-afzal)]

review: Approve

[Abdullah Khan Wazir (abdullah-khan)]

Looks good.

review: Approve

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

22. By Bilal Baqar on 2016-03-13

Fixing sleep

23. By Bilal Baqar on 2016-03-13

Fixing sleep

=== modified file 'hooks/pg_dir_context.py'
--- hooks/pg_dir_context.py	2016-01-26 18:44:19 +0000
+++ hooks/pg_dir_context.py	2016-03-13 03:51:15 +0000
@@ -3,6 +3,10 @@
 # This file contains the class that generates context
 # for PLUMgrid template files.
 
+import re
+from charmhelpers.contrib.openstack import context
+from charmhelpers.contrib.openstack.utils import get_host_ip
+from charmhelpers.contrib.network.ip import get_address_in_network
 from charmhelpers.core.hookenv import (
     config,
     unit_get,
@@ -12,12 +16,10 @@
     related_units,
     relation_get,
 )
-from charmhelpers.contrib.openstack import context
-from charmhelpers.contrib.openstack.utils import get_host_ip
-from charmhelpers.contrib.network.ip import get_address_in_network
-
-import re
-from socket import gethostname as get_unit_hostname
+from socket import (
+    gethostname,
+    getfqdn
+)
 
 
 def _pg_dir_ips():
@@ -71,6 +73,7 @@
         pg_dir_ips = _pg_dir_ips()
         pg_dir_ips.append(str(get_address_in_network(network=None,
                           fallback=get_host_ip(unit_get('private-address')))))
+        pg_dir_ips = sorted(pg_dir_ips)
         pg_ctxt['director_ips'] = pg_dir_ips
         pg_dir_ips_string = ''
         single_ip = True
@@ -82,8 +85,9 @@
                 pg_dir_ips_string = pg_dir_ips_string + ',' + str(ip)
         pg_ctxt['director_ips_string'] = pg_dir_ips_string
         pg_ctxt['virtual_ip'] = conf['plumgrid-virtual-ip']
-        unit_hostname = get_unit_hostname()
+        unit_hostname = gethostname()
         pg_ctxt['pg_hostname'] = unit_hostname
+        pg_ctxt['pg_fqdn'] = getfqdn()
         from pg_dir_utils import get_mgmt_interface, get_fabric_interface
         pg_ctxt['interface'] = get_mgmt_interface()
         pg_ctxt['fabric_interface'] = get_fabric_interface()

=== modified file 'hooks/pg_dir_hooks.py'
--- hooks/pg_dir_hooks.py	2016-01-14 12:39:52 +0000
+++ hooks/pg_dir_hooks.py	2016-03-13 03:51:15 +0000
@@ -7,6 +7,7 @@
 
 import sys
 import time
+
 from charmhelpers.core.hookenv import (
     Hooks,
     UnregisteredHookError,
@@ -30,7 +31,8 @@
     ensure_mtu,
     add_lcm_key,
     post_pg_license,
-    fabric_interface_changed
+    fabric_interface_changed,
+    load_iptables
 )
 
 hooks = Hooks()
@@ -42,6 +44,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:
@@ -109,6 +112,15 @@
             time.sleep(15)
 
 
[e-mail]('upgrade-charm')
+def upgrade_charm():
+    '''
+    This hook is run when the charm is upgraded
+    '''
+    load_iptables()
+    CONFIGS.write_all()
+
+
 @hooks.hook('stop')
 def stop():
     '''

=== modified file 'hooks/pg_dir_utils.py'
--- hooks/pg_dir_utils.py	2016-03-03 20:56:40 +0000
+++ hooks/pg_dir_utils.py	2016-03-13 03:51:15 +0000
@@ -2,8 +2,18 @@
 
 # This file contains functions used by the hooks to deploy PLUMgrid Director.
 
+import pg_dir_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.openstack import templating
+from charmhelpers.core.host import set_nic_mtu
+from charmhelpers.contrib.storage.linux.ceph import modprobe
 from charmhelpers.core.hookenv import (
     log,
     config,
@@ -17,32 +27,22 @@
     is_address_in_network,
     get_iface_addr
 )
+from charmhelpers.core.host import (
+    service_start,
+    service_stop,
+)
 from charmhelpers.fetch import (
-    apt_cache
+    apt_cache,
+    apt_install
 )
-from charmhelpers.contrib.openstack import templating
-from charmhelpers.core.host import set_nic_mtu
-from collections import OrderedDict
-from charmhelpers.contrib.storage.linux.ceph import modprobe
 from charmhelpers.contrib.openstack.utils import (
     os_release,
 )
-from charmhelpers.core.host import (
-    service_start,
-    service_stop,
-)
-from socket import gethostname as get_unit_hostname
-import pg_dir_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_LXC_PATH = '/var/lib/libvirt/filesystems/plumgrid'
-
 PG_CONF = '%s/conf/pg/plumgrid.conf' % PG_LXC_DATA_PATH
 PG_KA_CONF = '%s/conf/etc/keepalived.conf' % PG_LXC_DATA_PATH
 PG_DEF_CONF = '%s/conf/pg/nginx.conf' % PG_LXC_DATA_PATH
@@ -52,7 +52,6 @@
 AUTH_KEY_PATH = '%s/root/.ssh/authorized_keys' % PG_LXC_DATA_PATH
 TEMP_LICENSE_FILE = '/tmp/license'
 
-
 BASE_RESOURCE_MAP = OrderedDict([
     (PG_KA_CONF, {
         'services': ['plumgrid'],
@@ -141,9 +140,7 @@
     '''
     Stops and Starts PLUMgrid service after flushing iptables.
     '''
-    service_stop('plumgrid')
-    time.sleep(2)
-    _exec_cmd(cmd=['iptables', '-F'])
+    stop_pg()
     service_start('plumgrid')
     time.sleep(5)
 
@@ -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)
 
 
@@ -341,3 +338,55 @@
         log('No change in PLUMgrid License')
         return 0
     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'])
+        _exec_cmd(['sudo', 'iptables', '-I', 'INPUT', '-s', network,
+                   '-d', '224.0.0.18/32', '-j', 'ACCEPT'])
+    _exec_cmd(['sudo', 'iptables', '-I', 'INPUT', '-p', 'vrrp', '-j',
+               'ACCEPT'])
+    _exec_cmd(['sudo', 'iptables', '-A', 'INPUT', '-p', 'tcp', '-j',
+               'ACCEPT', '-d', config('plumgrid-virtual-ip'), '-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_dir_hooks.py'
=== modified file 'templates/kilo/hosts'
--- templates/kilo/hosts	2015-07-29 18:11:14 +0000
+++ templates/kilo/hosts	2016-03-13 03:51:15 +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_dir_context.py'
--- unit_tests/test_pg_dir_context.py	2016-01-26 22:08:24 +0000
+++ unit_tests/test_pg_dir_context.py	2016-03-13 03:51:15 +0000
@@ -8,7 +8,8 @@
     'config',
     'unit_get',
     'get_host_ip',
-    'get_unit_hostname',
+    'gethostname',
+    'getfqdn'
 ]
 
 
@@ -71,7 +72,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.maas'
         self.get_host_ip.return_value = '192.168.100.201'
         _pg_dir_ips.return_value = ['192.168.100.202', '192.168.100.203']
         _mgmt_int.return_value = 'juju-br0'
@@ -87,14 +89,15 @@
             'neutron_url': 'https://None:9696',
             'virtual_ip': '192.168.100.250',
             'pg_hostname': 'node0',
+            'pg_fqdn': 'node0.maas',
             'interface': 'juju-br0',
             'fabric_interface': 'juju-br0',
             'label': 'node0',
             'fabric_mode': 'host',
             'virtual_router_id': '250',
-            'director_ips': ['192.168.100.202', '192.168.100.203',
-                             '192.168.100.201'],
+            'director_ips': ['192.168.100.201', '192.168.100.202',
+                             '192.168.100.203'],
             'director_ips_string':
-            '192.168.100.202,192.168.100.203,192.168.100.201',
+            '192.168.100.201,192.168.100.202,192.168.100.203',
         }
         self.assertEquals(expect, napi_ctxt())

=== modified file 'unit_tests/test_pg_dir_hooks.py'
--- unit_tests/test_pg_dir_hooks.py	2016-03-03 20:56:40 +0000
+++ unit_tests/test_pg_dir_hooks.py	2016-03-13 03:51:15 +0000
@@ -31,7 +31,8 @@
     'add_lcm_key',
     'determine_packages',
     'post_pg_license',
-    'config'
+    'config',
+    'load_iptables'
 ]
 NEUTRON_CONF_DIR = "/etc/neutron"