Merge lp:~ivoks/charms/precise/nova-cloud-controller/syslog into lp:~charmers/charms/precise/nova-cloud-controller/trunk

[Ante Karamatić]

Logging to syslog is one of common requirements in enterprise setup.

[Marco Ceppi (marcoceppi)]

Deferring to openstack-charmers

review: Abstain

[James Page (james-page)]

I discuss with Yolanda I we agreed a generic SyslogConfig context should be used across all charms; makes it easier to expand support/update later on.

review: Needs Fixing

Unmerged revisions

59. By Ante Karamatić on 2014-01-27

Add option of logging to syslog

=== modified file 'config.yaml'
--- config.yaml	2013-11-08 05:41:39 +0000
+++ config.yaml	2014-01-27 15:14:06 +0000
@@ -126,6 +126,12 @@
   ssl_key:
     type: string
     description: SSL key to use with certificate specified as ssl_cert.
+  use-syslog:
+    type: boolean
+    default: False
+    description: |
+      By default, all services will log into their corresponding log files.
+      Setting this to True will force all services to log to the syslog.
   # Neutron NVP Plugin configuration
   nvp-controllers:
     type: string

=== modified file 'hooks/nova_cc_context.py'
--- hooks/nova_cc_context.py	2013-10-16 10:47:19 +0000
+++ hooks/nova_cc_context.py	2014-01-27 15:14:06 +0000
@@ -139,6 +139,7 @@
     def __call__(self):
         ctxt = super(NeutronCCContext, self).__call__()
         ctxt['external_network'] = config('neutron-external-network')
+        ctxt['use_syslog'] = config('use-syslog')
         if 'nvp' in [config('quantum-plugin'), config('neutron-plugin')]:
             _config = config()
             for k, v in _config.iteritems():

=== modified file 'revision'
--- revision	2013-11-08 05:41:39 +0000
+++ revision	2014-01-27 15:14:06 +0000
@@ -1,1 +1,1 @@
-311
+312

=== modified file 'templates/essex/nova.conf'
--- templates/essex/nova.conf	2013-08-19 21:13:45 +0000
+++ templates/essex/nova.conf	2014-01-27 15:14:06 +0000
@@ -14,6 +14,7 @@
 --connection_type=libvirt
 --root_helper=sudo nova-rootwrap
 --verbose
+--use_syslog={{ use_syslog }}
 --ec2_private_dns_show_ip
 {% if database_host -%}
 --sql_connection=mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}

=== modified file 'templates/folsom/nova.conf'
--- templates/folsom/nova.conf	2013-10-28 19:03:14 +0000
+++ templates/folsom/nova.conf	2014-01-27 15:14:06 +0000
@@ -14,6 +14,7 @@
 connection_type=libvirt
 root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
 verbose=True
+use_syslog={{ use_syslog }}
 ec2_private_dns_show_ip=True
 api_paste_config=/etc/nova/api-paste.ini
 volumes_path=/var/lib/nova/volumes

=== modified file 'templates/folsom/ovs_quantum_plugin.ini'
--- templates/folsom/ovs_quantum_plugin.ini	2013-08-19 21:13:45 +0000
+++ templates/folsom/ovs_quantum_plugin.ini	2014-01-27 15:14:06 +0000
@@ -3,6 +3,9 @@
 # [ WARNING ]
 # Configuration file maintained by Juju. Local changes may be overwritten.
 ###############################################################################
+[DEFAULT]
+use_syslog = {{ use_syslog }}
+
 [OVS]
 tunnel_id_ranges = 1:1000
 tenant_network_type = gre

=== modified file 'templates/folsom/quantum.conf'
--- templates/folsom/quantum.conf	2013-08-19 21:13:45 +0000
+++ templates/folsom/quantum.conf	2014-01-27 15:14:06 +0000
@@ -15,6 +15,7 @@
 {% if core_plugin -%}
 core_plugin =  {{ core_plugin }}
 {% endif -%}
+use_syslog = {{ use_syslog }}
 api_paste_config = /etc/quantum/api-paste.ini
 auth_strategy = keystone
 control_exchange = quantum

=== modified file 'templates/havana/neutron.conf'
--- templates/havana/neutron.conf	2013-12-12 20:10:37 +0000
+++ templates/havana/neutron.conf	2014-01-27 15:14:06 +0000
@@ -8,6 +8,7 @@
 bind_host = 0.0.0.0
 auth_strategy = keystone
 notification_driver = neutron.openstack.common.notifier.rpc_notifier
+use_syslog = {{ use_syslog }}
 {% if neutron_bind_port -%}
 bind_port = {{ neutron_bind_port }}
 {% else -%}

=== modified file 'templates/havana/nvp.ini'
--- templates/havana/nvp.ini	2013-10-16 11:14:35 +0000
+++ templates/havana/nvp.ini	2014-01-27 15:14:06 +0000
@@ -9,3 +9,4 @@
 nvp_controllers = {{ nvp_controllers }}
 default_tz_uuid = {{ nvp_tz_uuid }}
 default_l3_gw_service_uuid = {{ nvp_l3_uuid }}
+use_syslog = {{ use_syslog }}

=== modified file 'templates/havana/ovs_neutron_plugin.ini'
--- templates/havana/ovs_neutron_plugin.ini	2013-09-25 10:49:12 +0000
+++ templates/havana/ovs_neutron_plugin.ini	2014-01-27 15:14:06 +0000
@@ -1,3 +1,6 @@
+[DEFAULT]
+use_syslog = {{ use_syslog }}
+
 [OVS]
 tunnel_id_ranges = 1:1000
 tenant_network_type = gre