diff --git a/conf/components/neutron.yaml b/conf/components/neutron.yaml index 984d7cc2..eebd0cad 100644 --- a/conf/components/neutron.yaml +++ b/conf/components/neutron.yaml @@ -22,9 +22,9 @@ integration_bridge: br-int # When building a package for the neutron the arguments to the individual daemons # will be expanded to include the following runtime arguments. daemon_args: - neutron-server: "'--config-file=/etc/neutron/plugin.ini --config-file=/etc/neutron/neutron.conf'" - neutron-l3-agent: "'--config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/neutron.conf'" - neutron-dhcp-agent: "'--config-file=/etc/neutron/dhcp_agent.ini --config-file=/etc/neutron/neutron.conf'" - neutron-metadata-agent: "'--config-file=/etc/neutron/metadata_agent.ini --config-file=/etc/neutron/neutron.conf'" - neutron-openvswitch-agent: "'--config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-file=/etc/neutron/neutron.conf'" + neutron-server: "--config-file=/etc/neutron/plugin.ini --config-file=/etc/neutron/neutron.conf" + neutron-l3-agent: "--config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/neutron.conf" + neutron-dhcp-agent: "--config-file=/etc/neutron/dhcp_agent.ini --config-file=/etc/neutron/neutron.conf" + neutron-metadata-agent: "--config-file=/etc/neutron/metadata_agent.ini --config-file=/etc/neutron/neutron.conf" + neutron-openvswitch-agent: "--config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-file=/etc/neutron/neutron.conf" ... diff --git a/conf/templates/packaging/common.init b/conf/templates/packaging/common.init index 2ef34a42..f98ed19c 100644 --- a/conf/templates/packaging/common.init +++ b/conf/templates/packaging/common.init @@ -17,7 +17,7 @@ prog=openstack-$bin exec="/usr/bin/$bin" pidfile="/var/run/$package/\$prog.pid" daemon_user=$package -daemon_args=$daemon_args +daemon_args='$daemon_args' #raw [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog diff --git a/conf/templates/packaging/common.service b/conf/templates/packaging/common.service index 57e6adc5..20b27e85 100644 --- a/conf/templates/packaging/common.service +++ b/conf/templates/packaging/common.service @@ -5,7 +5,8 @@ After=syslog.target network.target [Service] Type=simple User=$package -ExecStart=/usr/bin/$bin +ExecStart=/usr/bin/$bin $daemon_args +StandardOutput=null [Install] WantedBy=multi-user.target