diff options
32 files changed, 80 insertions, 27 deletions
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service index 627d261a..a5228e4c 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service @@ -7,7 +7,9 @@ Wants=network-online.target [Service] Type=simple User=ceilometer -ExecStart=/usr/bin/ceilometer-alarm-evaluator --config-file /etc/ceilometer/ceilometer.conf --logfile /var/log/ceilometer/alarm-evaluator.log +StandardOutput=null +StandardError=null +ExecStart=/usr/bin/ceilometer-alarm-evaluator --config-file /etc/ceilometer/ceilometer.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service index c30420ed..fc074b06 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service @@ -7,7 +7,9 @@ Wants=network-online.target [Service] Type=simple User=ceilometer -ExecStart=/usr/bin/ceilometer-alarm-notifier --config-file /etc/ceilometer/ceilometer.conf --logfile /var/log/ceilometer/alarm-notifier.log +StandardOutput=null +StandardError=null +ExecStart=/usr/bin/ceilometer-alarm-notifier --config-file /etc/ceilometer/ceilometer.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service index 8a6c44d9..31bb78a6 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service @@ -7,7 +7,9 @@ Wants=network-online.target [Service] Type=simple User=ceilometer -ExecStart=/usr/bin/ceilometer-api --config-file /etc/ceilometer/ceilometer.conf --logfile /var/log/ceilometer/api.log +StandardOutput=null +StandardError=null +ExecStart=/usr/bin/ceilometer-api --config-file /etc/ceilometer/ceilometer.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-central.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-central.service index 48d6e5f6..daa91c13 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-central.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-central.service @@ -7,7 +7,9 @@ Wants=network-online.target [Service] Type=simple User=ceilometer -ExecStart=/usr/bin/ceilometer-agent-central --config-file /etc/ceilometer/ceilometer.conf --logfile /var/log/ceilometer/central.log +StandardOutput=null +StandardError=null +ExecStart=/usr/bin/ceilometer-agent-central --config-file /etc/ceilometer/ceilometer.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service index d1de528d..e510285c 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service @@ -7,7 +7,9 @@ Wants=network-online.target [Service] Type=simple User=ceilometer -ExecStart=/usr/bin/ceilometer-collector --config-file /etc/ceilometer/ceilometer.conf --logfile /var/log/ceilometer/collector.log +StandardOutput=null +StandardError=null +ExecStart=/usr/bin/ceilometer-collector --config-file /etc/ceilometer/ceilometer.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service index 95c6d87d..ccb78e2a 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service @@ -7,7 +7,9 @@ Wants=network-online.target [Service] Type=simple User=ceilometer -ExecStart=/usr/bin/ceilometer-agent-compute --config-file /etc/ceilometer/ceilometer.conf --logfile /var/log/ceilometer/compute.log +StandardOutput=null +StandardError=null +ExecStart=/usr/bin/ceilometer-agent-compute --config-file /etc/ceilometer/ceilometer.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-notification.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-notification.service index 3385ec9f..fcd210fe 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-notification.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-notification.service @@ -7,7 +7,9 @@ Wants=network-online.target [Service] Type=simple User=ceilometer -ExecStart=/usr/bin/ceilometer-agent-notification --config-file /etc/ceilometer/ceilometer.conf --logfile /var/log/ceilometer/agent-notification.log +StandardOutput=null +StandardError=null +ExecStart=/usr/bin/ceilometer-agent-notification --config-file /etc/ceilometer/ceilometer.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-api.service b/openstack/usr/lib/systemd/system/openstack-cinder-api.service index cf84a0e0..d932f862 100644 --- a/openstack/usr/lib/systemd/system/openstack-cinder-api.service +++ b/openstack/usr/lib/systemd/system/openstack-cinder-api.service @@ -7,7 +7,9 @@ Wants=network-online.target [Service] Type=simple User=cinder -ExecStart=/usr/bin/cinder-api --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-api.log +StandardOutput=null +StandardError=null +ExecStart=/usr/bin/cinder-api --config-file /etc/cinder/cinder.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-backup.service b/openstack/usr/lib/systemd/system/openstack-cinder-backup.service index 3293f222..c2c44dd5 100644 --- a/openstack/usr/lib/systemd/system/openstack-cinder-backup.service +++ b/openstack/usr/lib/systemd/system/openstack-cinder-backup.service @@ -7,7 +7,9 @@ Wants=network-online.target [Service] Type=simple User=cinder -ExecStart=/usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-backup.log +StandardOutput=null +StandardError=null +ExecStart=/usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service b/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service index 4de59c10..9e14ead5 100644 --- a/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service +++ b/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service @@ -7,7 +7,9 @@ Wants=network-online.target [Service] Type=simple User=cinder -ExecStart=/usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-scheduler.log +StandardOutput=null +StandardError=null +ExecStart=/usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-volume.service b/openstack/usr/lib/systemd/system/openstack-cinder-volume.service index 58afd992..e080b6b3 100644 --- a/openstack/usr/lib/systemd/system/openstack-cinder-volume.service +++ b/openstack/usr/lib/systemd/system/openstack-cinder-volume.service @@ -7,7 +7,9 @@ Wants=network-online.target [Service] Type=simple User=cinder -ExecStart=/usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-volume.log +StandardOutput=null +StandardError=null +ExecStart=/usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-glance-api.service b/openstack/usr/lib/systemd/system/openstack-glance-api.service index dc9fd2fd..810e0965 100644 --- a/openstack/usr/lib/systemd/system/openstack-glance-api.service +++ b/openstack/usr/lib/systemd/system/openstack-glance-api.service @@ -7,6 +7,8 @@ Wants=network-online.target [Service] Type=simple User=glance +StandardOutput=null +StandardError=null ExecStart=/usr/bin/glance-api --config-file /etc/glance/glance-api.conf [Install] diff --git a/openstack/usr/lib/systemd/system/openstack-glance-registry.service b/openstack/usr/lib/systemd/system/openstack-glance-registry.service index b2cc8b49..02b062ca 100644 --- a/openstack/usr/lib/systemd/system/openstack-glance-registry.service +++ b/openstack/usr/lib/systemd/system/openstack-glance-registry.service @@ -7,6 +7,8 @@ Wants=network-online.target [Service] Type=simple User=glance +StandardOutput=null +StandardError=null ExecStart=/usr/bin/glance-registry --config-file /etc/glance/glance-registry.conf [Install] diff --git a/openstack/usr/lib/systemd/system/openstack-ironic-api.service b/openstack/usr/lib/systemd/system/openstack-ironic-api.service index 8d05d424..7b9357f2 100644 --- a/openstack/usr/lib/systemd/system/openstack-ironic-api.service +++ b/openstack/usr/lib/systemd/system/openstack-ironic-api.service @@ -7,6 +7,8 @@ Wants=network-online.target [Service] Type=simple User=ironic +StandardOutput=null +StandardError=null ExecStart=/usr/bin/ironic-api --config-file /etc/ironic/ironic.conf [Install] diff --git a/openstack/usr/lib/systemd/system/openstack-ironic-conductor.service b/openstack/usr/lib/systemd/system/openstack-ironic-conductor.service index 8ce3f840..b18f4abf 100644 --- a/openstack/usr/lib/systemd/system/openstack-ironic-conductor.service +++ b/openstack/usr/lib/systemd/system/openstack-ironic-conductor.service @@ -7,6 +7,8 @@ Wants=network-online.target [Service] Type=simple User=ironic +StandardOutput=null +StandardError=null ExecStart=/usr/bin/ironic-conductor --config-file /etc/ironic/ironic.conf [Install] diff --git a/openstack/usr/lib/systemd/system/openstack-keystone.service b/openstack/usr/lib/systemd/system/openstack-keystone.service index 9e791659..f9cc66f4 100644 --- a/openstack/usr/lib/systemd/system/openstack-keystone.service +++ b/openstack/usr/lib/systemd/system/openstack-keystone.service @@ -8,6 +8,8 @@ Wants=network-online.target Type=notify Restart=always User=keystone +StandardOutput=null +StandardError=null ExecStart=/usr/bin/keystone-all --config-file /etc/keystone/keystone.conf [Install] diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service index 17a37750..9080f3c1 100644 --- a/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service +++ b/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service @@ -7,10 +7,11 @@ Wants=network-online.target [Service] Type=simple User=neutron +StandardOutput=null +StandardError=null ExecStart=/usr/bin/neutron-dhcp-agent \ --config-file=/etc/neutron/neutron.conf \ - --config-file=/etc/neutron/dhcp_agent.ini \ - --log-file=/var/log/neutron/dhcp-agent.log + --config-file=/etc/neutron/dhcp_agent.ini [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service index 2e966666..76efea5c 100644 --- a/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service +++ b/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service @@ -7,11 +7,12 @@ Wants=network-online.target [Service] Type=simple User=neutron +StandardOutput=null +StandardError=null ExecStart=/usr/bin/neutron-l3-agent \ --config-file=/etc/neutron/neutron.conf \ --config-file=/etc/neutron/l3_agent.ini \ - --config-file=/etc/neutron/fwaas_driver.ini \ - --log-file=/var/log/neutron/l3-agent.log + --config-file=/etc/neutron/fwaas_driver.ini [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service index 816abeed..20540e4c 100644 --- a/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service +++ b/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service @@ -7,10 +7,11 @@ Wants=network-online.target [Service] Type=simple User=neutron +StandardOutput=null +StandardError=null ExecStart=/usr/bin/neutron-metadata-agent \ --config-file=/etc/neutron/neutron.conf \ - --config-file=/etc/neutron/metadata_agent.ini \ - --log-file=/var/log/neutron/metadata-agent.log + --config-file=/etc/neutron/metadata_agent.ini [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service b/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service index 0a794838..b968232e 100644 --- a/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service +++ b/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service @@ -9,10 +9,10 @@ ConditionFileIsExecutable=/usr/bin/neutron-ovs-cleanup [Service] Type=oneshot RemainAfterExit=yes +StandardOutput=null +StandardError=null User=neutron -ExecStart=/usr/bin/neutron-ovs-cleanup \ - --log-file /var/log/neutron/ovs-cleanup.log \ - --config-file /etc/neutron/neutron.conf --verbose +ExecStart=/usr/bin/neutron-ovs-cleanup --config-file /etc/neutron/neutron.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service index b162b11c..6c579a62 100644 --- a/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service +++ b/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service @@ -7,10 +7,11 @@ Wants=network-online.target [Service] Type=simple User=neutron +StandardOutput=null +StandardError=null ExecStart=/usr/bin/neutron-openvswitch-agent \ --config-file=/etc/neutron/neutron.conf \ - --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini \ - --log-file=/var/log/neutron/openvswitch-agent.log + --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-server.service b/openstack/usr/lib/systemd/system/openstack-neutron-server.service index a43b5bb8..eb839f0c 100644 --- a/openstack/usr/lib/systemd/system/openstack-neutron-server.service +++ b/openstack/usr/lib/systemd/system/openstack-neutron-server.service @@ -7,10 +7,11 @@ Wants=network-online.target [Service] Type=simple User=neutron +StandardOutput=null +StandardError=null ExecStart=/usr/bin/neutron-server \ --config-file=/etc/neutron/neutron.conf \ - --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini \ - --log-file=/var/log/neutron/neutron-server.log + --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-nova-api.service b/openstack/usr/lib/systemd/system/openstack-nova-api.service index d06afcaa..521353db 100644 --- a/openstack/usr/lib/systemd/system/openstack-nova-api.service +++ b/openstack/usr/lib/systemd/system/openstack-nova-api.service @@ -7,6 +7,8 @@ Wants=network-online.target [Service] Type=simple User=nova +StandardOutput=null +StandardError=null ExecStart=/usr/bin/nova-api --config-file /etc/nova/nova.conf [Install] diff --git a/openstack/usr/lib/systemd/system/openstack-nova-cert.service b/openstack/usr/lib/systemd/system/openstack-nova-cert.service index 418b060c..b3733816 100644 --- a/openstack/usr/lib/systemd/system/openstack-nova-cert.service +++ b/openstack/usr/lib/systemd/system/openstack-nova-cert.service @@ -7,6 +7,8 @@ Wants=network-online.target [Service] Type=simple User=nova +StandardOutput=null +StandardError=null ExecStart=/usr/bin/nova-cert --config-file /etc/nova/nova.conf [Install] diff --git a/openstack/usr/lib/systemd/system/openstack-nova-compute.service b/openstack/usr/lib/systemd/system/openstack-nova-compute.service index c9c6924c..b1e76221 100644 --- a/openstack/usr/lib/systemd/system/openstack-nova-compute.service +++ b/openstack/usr/lib/systemd/system/openstack-nova-compute.service @@ -8,6 +8,8 @@ Requires=libvirtd.service [Service] Type=simple User=nova +StandardOutput=null +StandardError=null ExecStart=/usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/nova-compute.conf [Install] diff --git a/openstack/usr/lib/systemd/system/openstack-nova-conductor.service b/openstack/usr/lib/systemd/system/openstack-nova-conductor.service index bf8e0631..91021b5a 100644 --- a/openstack/usr/lib/systemd/system/openstack-nova-conductor.service +++ b/openstack/usr/lib/systemd/system/openstack-nova-conductor.service @@ -8,7 +8,9 @@ Requires=libvirtd.service [Service] Type=simple User=nova -ExecStart=/usr/bin/nova-conductor --config-file /etc/nova/nova.conf --logfile /var/log/nova/conductor.log +StandardOutput=null +StandardError=null +ExecStart=/usr/bin/nova-conductor --config-file /etc/nova/nova.conf [Install] WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service b/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service index 68607354..e22780a9 100644 --- a/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service +++ b/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service @@ -7,6 +7,8 @@ Wants=network-online.target [Service] Type=simple User=nova +StandardOutput=null +StandardError=null ExecStart=/usr/bin/nova-consoleauth --config-file /etc/nova/nova.conf [Install] diff --git a/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service b/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service index ecdadde2..8cbb20fd 100644 --- a/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service +++ b/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service @@ -7,6 +7,8 @@ Wants=network-online.target [Service] Type=simple User=nova +StandardOutput=null +StandardError=null ExecStart=/usr/bin/nova-novncproxy --config-file /etc/nova/nova.conf --web /usr/share/novnc [Install] diff --git a/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service b/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service index 9009d49a..e89f0d3e 100644 --- a/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service +++ b/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service @@ -7,6 +7,8 @@ Wants=network-online.target [Service] Type=simple User=nova +StandardOutput=null +StandardError=null ExecStart=/usr/bin/nova-scheduler --config-file /etc/nova/nova.conf [Install] diff --git a/openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service b/openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service index 5f5a5b41..30af8305 100644 --- a/openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service +++ b/openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service @@ -7,6 +7,8 @@ Wants=network-online.target [Service] Type=simple User=nova +StandardOutput=null +StandardError=null ExecStart=/usr/bin/nova-serialproxy --config-file /etc/nova/nova.conf [Install] diff --git a/openstack/usr/share/openstack/ironic/ironic.conf b/openstack/usr/share/openstack/ironic/ironic.conf index 6888ede6..75c62b8e 100644 --- a/openstack/usr/share/openstack/ironic/ironic.conf +++ b/openstack/usr/share/openstack/ironic/ironic.conf @@ -442,7 +442,7 @@ enabled_drivers=pxe_ipmitool,pxe_ssh # Use syslog for logging. Existing syslog format is DEPRECATED # during I, and will change in J to honor RFC5424. (boolean # value) -#use_syslog=false +use_syslog=True # (Optional) Enables or disables syslog rfc5424 format for # logging. If enabled, prefixes the MSG part of the syslog diff --git a/openstack/usr/share/openstack/keystone/keystone.conf b/openstack/usr/share/openstack/keystone/keystone.conf index 3d242a50..4e04c81b 100644 --- a/openstack/usr/share/openstack/keystone/keystone.conf +++ b/openstack/usr/share/openstack/keystone/keystone.conf @@ -421,7 +421,7 @@ rpc_backend=rabbit # Use syslog for logging. Existing syslog format is DEPRECATED # during I, and will change in J to honor RFC5424. (boolean # value) -#use_syslog=false +use_syslog=True # (Optional) Enables or disables syslog rfc5424 format for # logging. If enabled, prefixes the MSG part of the syslog |