diff --git a/hooks/pg_dir_hooks.py b/hooks/pg_dir_hooks.py index 81f9013..add2a4d 100755 --- a/hooks/pg_dir_hooks.py +++ b/hooks/pg_dir_hooks.py @@ -40,7 +40,8 @@ from pg_dir_utils import ( fabric_interface_changed, load_iptables, restart_on_change, - director_cluster_ready + director_cluster_ready, + configure_pg_sources ) hooks = Hooks() @@ -135,6 +136,8 @@ def config_changed(): 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: diff --git a/hooks/pg_dir_utils.py b/hooks/pg_dir_utils.py index 48f462d..a9ba277 100644 --- a/hooks/pg_dir_utils.py +++ b/hooks/pg_dir_utils.py @@ -42,6 +42,7 @@ from charmhelpers.contrib.openstack.utils import ( 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 @@ BASE_RESOURCE_MAP = OrderedDict([ ]) +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 diff --git a/templates/kilo/00-pg.conf b/templates/kilo/00-pg.conf index e744a27..ac09811 100644 --- a/templates/kilo/00-pg.conf +++ b/templates/kilo/00-pg.conf @@ -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" ~ diff --git a/templates/kilo/plumgrid.conf b/templates/kilo/plumgrid.conf index acb8e9b..f56f11f 100644 --- a/templates/kilo/plumgrid.conf +++ b/templates/kilo/plumgrid.conf @@ -5,6 +5,9 @@ label={{ label}} 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=