Merge lp:~junaidali/charms/trusty/plumgrid-director/trunk into lp:~plumgrid-team/charms/trusty/plumgrid-director/trunk

[Junaid Ali]

[lp:~junaidali/charms/trusty/plumgrid-director/trunk]

31. By Bilal Baqar on 2016-04-25

Merge: Liberty/Mitaka support

32. By Bilal Baqar on 2016-05-18

Merge - Mitaka changes
- Created new relation with neutron-api-plumgrid
- getting pg creds in config
- nginx conf changes for middleware

33. By Bilal Baqar on 2016-05-28

5.1 changes
- configure-pg-sources added
- updated templates

=== modified file 'hooks/pg_dir_hooks.py'
--- hooks/pg_dir_hooks.py	2016-05-04 13:24:55 +0000
+++ hooks/pg_dir_hooks.py	2016-05-23 10:30:28 +0000
@@ -40,7 +40,8 @@
     fabric_interface_changed,
     load_iptables,
     restart_on_change,
-    director_cluster_ready
+    director_cluster_ready,
+    configure_pg_sources
 )
 
 hooks = Hooks()
@@ -135,6 +136,8 @@
             charm_config.changed('iovisor-build')):
         status_set('maintenance', 'Upgrading apt packages')
         stop_pg()
+        if charm_config.changed('install_sources'):
+            configure_pg_sources()
         configure_sources(update=True)
         pkgs = determine_packages()
         for pkg in pkgs:

=== modified file 'hooks/pg_dir_utils.py'
--- hooks/pg_dir_utils.py	2016-05-01 02:16:59 +0000
+++ hooks/pg_dir_utils.py	2016-05-23 10:30:28 +0000
@@ -42,6 +42,7 @@
     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'
@@ -88,6 +89,22 @@
 ])
 
 
+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 director as specified

=== modified file 'templates/kilo/00-pg.conf'
--- templates/kilo/00-pg.conf	2016-04-06 16:27:37 +0000
+++ templates/kilo/00-pg.conf	2016-05-23 10:30:28 +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/plumgrid.conf'
--- templates/kilo/plumgrid.conf	2015-08-10 10:06:33 +0000
+++ templates/kilo/plumgrid.conf	2016-05-23 10:30:28 +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=