added syslog support

config.yaml

@@ -26,6 +26,12 @@ options:
     default: openstack
     type: string
     decsription: Rabbitmq vhost
+  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.
   database-user:
     default: nova
     type: string

hooks/nova_compute_context.py

@@ -99,6 +99,7 @@ class NovaComputeLibvirtContext(context.OSContextGenerator):
             # nova.conf
             ctxt['live_migration_uri'] = 'qemu+ssh://%s/system'
 
+        ctxt['use_syslog'] = config('use-syslog')
         return ctxt
 
 

revision

@@ -1 +1 @@
-130
+131

templates/essex/nova.conf

@@ -16,6 +16,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 }}

templates/folsom/nova.conf

@@ -18,6 +18,7 @@ libvirt_use_virtio_for_bridges=True
 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

templates/folsom/ovs_quantum_plugin.ini

@@ -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

templates/folsom/quantum.conf

@@ -11,6 +11,7 @@ bind_port = 9696
 {% if core_plugin -%}
 core_plugin =  {{ core_plugin }}
 {% endif -%}
+use_syslog = {{ use_syslog }}
 api_paste_config = /etc/quantum/api-paste.ini
 auth_strategy = keystone
 notification_driver = quantum.openstack.common.notifier.rpc_notifier

templates/grizzly/nova.conf

@@ -18,6 +18,7 @@ libvirt_use_virtio_for_bridges=True
 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

templates/havana/neutron.conf

@@ -16,6 +16,7 @@ core_plugin =  {{ core_plugin }}
 api_paste_config = /etc/neutron/api-paste.ini
 auth_strategy = keystone
 notification_driver = neutron.openstack.common.notifier.rpc_notifier
+use_syslog = {{ use_syslog }}
 default_notification_level = INFO
 notification_topics = notifications
 

templates/havana/nova.conf

@@ -18,6 +18,7 @@ libvirt_use_virtio_for_bridges=True
 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
@@ -89,4 +90,4 @@ live_migration_uri = {{ live_migration_uri }}
 {% for key, value in sections['DEFAULT'] -%}
 {{ key }} = {{ value }}
 {% endfor -%}
-{% endif -%}
+{% endif -%}

templates/havana/ovs_neutron_plugin.ini

@@ -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

unit_tests/test_nova_compute_contexts.py

@@ -170,10 +170,10 @@ class NovaComputeContextTests(CharmTestCase):
     def test_libvirt_bin_context_no_migration(self):
         self.test_config.set('enable-live-migration', False)
         libvirt = context.NovaComputeLibvirtContext()
-        self.assertEquals({'libvirtd_opts': '-d', 'listen_tls': 0}, libvirt())
+        self.assertEquals({'libvirtd_opts': '-d', 'listen_tls': 0, 'use_syslog': False}, libvirt())
 
     def test_libvirt_bin_context_migration_tcp_listen(self):
         self.test_config.set('enable-live-migration', True)
         libvirt = context.NovaComputeLibvirtContext()
         self.assertEquals(
-            {'libvirtd_opts': '-d -l', 'listen_tls': 0}, libvirt())
+            {'libvirtd_opts': '-d -l', 'listen_tls': 0, 'use_syslog': False}, libvirt())