Added status messages and updated opsvm changes

This commit is contained in:
Junaid Ali 2016-04-06 12:45:27 -04:00
parent 769e214bdf
commit 45ed163f14
3 changed files with 18 additions and 3 deletions

View File

@ -6,12 +6,13 @@
# in this file. # in this file.
import sys import sys
from charmhelpers.core.host import service_running
from charmhelpers.core.hookenv import ( from charmhelpers.core.hookenv import (
Hooks, Hooks,
UnregisteredHookError, UnregisteredHookError,
log, log,
config, config,
status_set
) )
from charmhelpers.fetch import ( from charmhelpers.fetch import (
@ -45,8 +46,10 @@ def install():
''' '''
Install hook is run when the charm is first deployed on a node. Install hook is run when the charm is first deployed on a node.
''' '''
status_set('maintenance', 'Executing pre-install')
load_iptables() load_iptables()
configure_sources(update=True) configure_sources(update=True)
status_set('maintenance', 'Installing apt packages')
pkgs = determine_packages() pkgs = determine_packages()
for pkg in pkgs: for pkg in pkgs:
apt_install(pkg, options=['--force-yes'], fatal=True) apt_install(pkg, options=['--force-yes'], fatal=True)
@ -88,6 +91,7 @@ def config_changed():
charm_config.changed('install_keys') or charm_config.changed('install_keys') or
charm_config.changed('iovisor-build')): charm_config.changed('iovisor-build')):
stop_pg() stop_pg()
status_set('maintenance', 'Upgrading apt packages')
configure_sources(update=True) configure_sources(update=True)
pkgs = determine_packages() pkgs = determine_packages()
for pkg in pkgs: for pkg in pkgs:
@ -113,6 +117,14 @@ def stop():
stop_pg() stop_pg()
@hooks.hook('update-status')
def update_status():
if service_running('plumgrid'):
status_set('active', 'Unit is ready')
else:
status_set('blocked', 'plumgrid service not running')
def main(): def main():
try: try:
hooks.execute(sys.argv) hooks.execute(sys.argv)

View File

@ -16,7 +16,8 @@ from charmhelpers.contrib.openstack import templating
from charmhelpers.core.hookenv import ( from charmhelpers.core.hookenv import (
log, log,
config, config,
unit_get unit_get,
status_set
) )
from charmhelpers.contrib.network.ip import ( from charmhelpers.contrib.network.ip import (
get_iface_from_addr, get_iface_from_addr,
@ -160,6 +161,7 @@ def restart_pg():
raise ValueError("plumgrid service couldn't be started") raise ValueError("plumgrid service couldn't be started")
else: else:
raise ValueError("libvirt-bin service couldn't be started") raise ValueError("libvirt-bin service couldn't be started")
status_set('active', 'Unit is ready')
def stop_pg(): def stop_pg():

View File

@ -1 +1,2 @@
$template ls_json,"{{'{'}}{{'%'}}timestamp:::date-rfc3339,jsonf:@timestamp%,%source:::jsonf:@source_host%,%msg:::json%}":syslogtag,isequal,"pg:" @{{ opsvm_ip }}:6000;ls_json $template ls_json,"{{'{'}}{{'%'}}timestamp:::date-rfc3339,jsonf:@timestamp%,%source:::jsonf:@source_host%,%msg:::json%}"
:syslogtag,isequal,"pg:" @{{ opsvm_ip }}:6000;ls_json