openstack/charm-neutron-openvswitch
Code Issues Proposed changes

General tidyup after initial feedback

Browse Source
This commit is contained in:
Liam Young 2014-06-17 15:37:02 +01:00
commit 5ccb59d6e9
6 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.yaml
View File

@ -13,3 +13,11 @@ options:
description: | description: |
By default, all services will log into their corresponding log files. By default, all services will log into their corresponding log files.
Setting this to True will force all services to log to the syslog. Setting this to True will force all services to log to the syslog.
debug:
default: False
type: boolean
description: Enable debug logging
verbose:
default: False
type: boolean
description: Enable verbose logging

7
hooks/neutron_ovs_context.py
View File

@ -2,10 +2,8 @@ from charmhelpers.core.hookenv import (
relation_ids, relation_ids,
related_units, related_units,
relation_get, relation_get,
is_relation_made,
config, config,
unit_get, unit_get,
log,
) )
from charmhelpers.contrib.openstack import context from charmhelpers.contrib.openstack import context
@ -14,9 +12,6 @@ from charmhelpers.contrib.network.ovs import add_bridge
from charmhelpers.contrib.openstack.utils import get_host_ip from charmhelpers.contrib.openstack.utils import get_host_ip
OVS_BRIDGE = 'br-int' OVS_BRIDGE = 'br-int'
class OSContextError(Exception):
pass
def _neutron_security_groups(): def _neutron_security_groups():
''' '''
Inspects current neutron-plugin relation and determine if nova-c-c has Inspects current neutron-plugin relation and determine if nova-c-c has
@ -61,4 +56,6 @@ class OVSPluginContext(context.NeutronContext):
ovs_ctxt['local_ip'] = get_host_ip(unit_get('private-address')) ovs_ctxt['local_ip'] = get_host_ip(unit_get('private-address'))
ovs_ctxt['neutron_security_groups'] = self.neutron_security_groups ovs_ctxt['neutron_security_groups'] = self.neutron_security_groups
ovs_ctxt['use_syslog'] = conf['use-syslog'] ovs_ctxt['use_syslog'] = conf['use-syslog']
ovs_ctxt['verbose'] = conf['verbose']
ovs_ctxt['debug'] = conf['debug']
return ovs_ctxt return ovs_ctxt

7
hooks/neutron_ovs_hooks.py
View File

@ -34,16 +34,13 @@ def install():
apt_update() apt_update()
apt_install(determine_packages(), fatal=True) apt_install(determine_packages(), fatal=True)
@hooks.hook('upgrade-charm')
@hooks.hook('neutron-plugin-relation-changed')
@hooks.hook('config-changed') @hooks.hook('config-changed')
@restart_on_change(restart_map()) @restart_on_change(restart_map())
def config_changed(): def config_changed():
CONFIGS.write_all() CONFIGS.write_all()
@hooks.hook('neutron-plugin-relation-changed')
@restart_on_change(restart_map())
def neutron_plugin_relation_changed():
CONFIGS.write_all()
@hooks.hook('amqp-relation-joined') @hooks.hook('amqp-relation-joined')
def amqp_joined(relation_id=None): def amqp_joined(relation_id=None):
relation_set(relation_id=relation_id, relation_set(relation_id=relation_id,

1
hooks/upgrade-charm Symbolic link
View File

@ -0,0 +1 @@
neutron_ovs_hooks.py

2
metadata.yaml
View File

@ -1,7 +1,7 @@
name: neutron-openvswitch name: neutron-openvswitch
subordinate: true subordinate: true
maintainer: Liam Young <liam.young@canonical.com> maintainer: Liam Young <liam.young@canonical.com>
summary: "Openstack neutron openvswitch plugin " summary: "Neutron OpenvSwitch Agent"
description: | description: |
Openstack neutron openvswitch plugin Openstack neutron openvswitch plugin
categories: categories:

4
templates/icehouse/neutron.conf
View File

@ -5,6 +5,9 @@
# Config managed by neutron-openvswitch charm # Config managed by neutron-openvswitch charm
############################################################################### ###############################################################################
[DEFAULT] [DEFAULT]
verbose = {{ verbose }}
debug = {{ debug }}
use_syslog = {{ use_syslog }}
state_path = /var/lib/neutron state_path = /var/lib/neutron
lock_path = $state_path/lock lock_path = $state_path/lock
bind_host = 0.0.0.0 bind_host = 0.0.0.0
@ -17,7 +20,6 @@ core_plugin = {{ core_plugin }}
api_paste_config = /etc/neutron/api-paste.ini api_paste_config = /etc/neutron/api-paste.ini
auth_strategy = keystone auth_strategy = keystone
notification_driver = neutron.openstack.common.notifier.rpc_notifier notification_driver = neutron.openstack.common.notifier.rpc_notifier
use_syslog = {{ use_syslog }}
default_notification_level = INFO default_notification_level = INFO
notification_topics = notifications notification_topics = notifications