From b5b11f8c87570e9fb67c53895ccbedb0e5e0bf98 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Mon, 23 Jun 2014 12:49:58 +0100 Subject: [PATCH] Fixes in response to bug comment --- config.yaml | 2 +- copyright | 9 + hooks/neutron_ovs_context.py | 4 +- hooks/neutron_ovs_hooks.py | 1 - hooks/neutron_ovs_utils.py | 10 +- icon.svg | 676 +++++++++++++++++++++++++++++++++++ 6 files changed, 691 insertions(+), 11 deletions(-) create mode 100644 copyright create mode 100644 icon.svg diff --git a/config.yaml b/config.yaml index e0cbc155..33eec22d 100644 --- a/config.yaml +++ b/config.yaml @@ -6,7 +6,7 @@ options: rabbit-vhost: default: openstack type: string - decsription: Rabbitmq vhost + description: Rabbitmq vhost use-syslog: type: boolean default: False diff --git a/copyright b/copyright new file mode 100644 index 00000000..d44f24cf --- /dev/null +++ b/copyright @@ -0,0 +1,9 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 + +Files: * +Copyright: 2012, Canonical Ltd. +License: GPL-3 + +License: GPL-3 + On Debian GNU/Linux system you can find the complete text of the + GPL-3 license in '/usr/share/common-licenses/GPL-3' diff --git a/hooks/neutron_ovs_context.py b/hooks/neutron_ovs_context.py index 93418293..9f8c1407 100644 --- a/hooks/neutron_ovs_context.py +++ b/hooks/neutron_ovs_context.py @@ -15,7 +15,7 @@ OVS_BRIDGE = 'br-int' def _neutron_security_groups(): ''' - Inspects current neutron-plugin relation and determine if nova-c-c has + Inspects current neutron-plugin relation and determine if neutron-api has instructed us to use neutron security groups. ''' for rid in relation_ids('neutron-plugin-api'): @@ -61,6 +61,8 @@ class OVSPluginContext(context.NeutronContext): conf = config() ovs_ctxt['local_ip'] = get_host_ip(unit_get('private-address')) ovs_ctxt['neutron_security_groups'] = self.neutron_security_groups + # TODO: We need to sort out the syslog and debug/verbose options as a + # general context helper ovs_ctxt['use_syslog'] = conf['use-syslog'] ovs_ctxt['verbose'] = conf['verbose'] ovs_ctxt['debug'] = conf['debug'] diff --git a/hooks/neutron_ovs_hooks.py b/hooks/neutron_ovs_hooks.py index b6c807f4..a8ba7194 100755 --- a/hooks/neutron_ovs_hooks.py +++ b/hooks/neutron_ovs_hooks.py @@ -34,7 +34,6 @@ def install(): apt_install(determine_packages(), fatal=True) -@hooks.hook('upgrade-charm') @hooks.hook('neutron-plugin-relation-changed') @hooks.hook('neutron-plugin-api-relation-changed') @hooks.hook('config-changed') diff --git a/hooks/neutron_ovs_utils.py b/hooks/neutron_ovs_utils.py index 7173621c..4e23d015 100644 --- a/hooks/neutron_ovs_utils.py +++ b/hooks/neutron_ovs_utils.py @@ -29,17 +29,11 @@ TEMPLATES = 'templates/' def determine_packages(): - ovs_pkgs = [] - pkgs = neutron_plugin_attribute('ovs', 'packages', - 'neutron') - for pkg in pkgs: - ovs_pkgs.extend(pkg) - - return set(ovs_pkgs) + return set(neutron_plugin_attribute('ovs', 'packages', 'neutron')) def register_configs(release=None): - release = release or os_release('nova-common') + release = release or os_release('neutron-common') configs = templating.OSConfigRenderer(templates_dir=TEMPLATES, openstack_release=release) for cfg, rscs in resource_map().iteritems(): diff --git a/icon.svg b/icon.svg new file mode 100644 index 00000000..d1884699 --- /dev/null +++ b/icon.svg @@ -0,0 +1,676 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +