From 3707dc63f05e5f123b49a3c044681769681060d3 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Fri, 20 Nov 2015 15:34:06 +0300 Subject: [PATCH] Remove neutron-dist.conf from packages neutron-dist.conf contains default values which are not managed by Puppet and brings unpredictable behavior of Neutron services Change-Id: I580d62f24ae56d5c87d85f96e87d319ac98a0248 Closes-bug: #1518273 --- .../rpm/SOURCES/neutron-dev-server.service | 2 +- .../rpm/SOURCES/neutron-dhcp-agent.service | 2 +- centos7/rpm/SOURCES/neutron-dist.conf | 19 --------------- centos7/rpm/SOURCES/neutron-l3-agent.service | 2 +- .../SOURCES/neutron-linuxbridge-agent.service | 2 +- .../SOURCES/neutron-metadata-agent.service | 2 +- .../SOURCES/neutron-metering-agent.service | 2 +- .../rpm/SOURCES/neutron-mlnx-agent.service | 2 +- .../rpm/SOURCES/neutron-netns-cleanup.init | 1 - .../rpm/SOURCES/neutron-netns-cleanup.service | 4 ++-- .../SOURCES/neutron-openvswitch-agent.service | 2 +- centos7/rpm/SOURCES/neutron-ovs-cleanup.init | 1 - .../rpm/SOURCES/neutron-ovs-cleanup.service | 4 ++-- .../rpm/SOURCES/neutron-rpc-server.service | 2 +- centos7/rpm/SOURCES/neutron-server.service | 2 +- .../SOURCES/neutron-sriov-nic-agent.service | 2 +- centos7/rpm/SPECS/openstack-neutron.spec | 23 ++----------------- 17 files changed, 17 insertions(+), 57 deletions(-) delete mode 100644 centos7/rpm/SOURCES/neutron-dist.conf diff --git a/centos7/rpm/SOURCES/neutron-dev-server.service b/centos7/rpm/SOURCES/neutron-dev-server.service index e971c9022..b7112951e 100644 --- a/centos7/rpm/SOURCES/neutron-dev-server.service +++ b/centos7/rpm/SOURCES/neutron-dev-server.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=notify User=neutron -ExecStart=/usr/bin/neutron-dev-server --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dev-server --log-file /var/log/neutron/dev-server.log +ExecStart=/usr/bin/neutron-dev-server --config-dir /usr/share/neutron/server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dev-server --log-file /var/log/neutron/dev-server.log PrivateTmp=true NotifyAccess=all KillMode=process diff --git a/centos7/rpm/SOURCES/neutron-dhcp-agent.service b/centos7/rpm/SOURCES/neutron-dhcp-agent.service index c03daa218..2a87073de 100644 --- a/centos7/rpm/SOURCES/neutron-dhcp-agent.service +++ b/centos7/rpm/SOURCES/neutron-dhcp-agent.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=simple User=neutron -ExecStart=/usr/bin/neutron-dhcp-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dhcp-agent --log-file /var/log/neutron/dhcp-agent.log +ExecStart=/usr/bin/neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dhcp-agent --log-file /var/log/neutron/dhcp-agent.log PrivateTmp=false KillMode=process diff --git a/centos7/rpm/SOURCES/neutron-dist.conf b/centos7/rpm/SOURCES/neutron-dist.conf deleted file mode 100644 index 479da8e8a..000000000 --- a/centos7/rpm/SOURCES/neutron-dist.conf +++ /dev/null @@ -1,19 +0,0 @@ -[DEFAULT] -verbose = True -lock_path = $state_path/lock -auth_strategy = noauth -notification_driver = neutron.openstack.common.notifier.rpc_notifier -allow_overlapping_ips = True -use_stderr = False -api_paste_config = /usr/share/neutron/api-paste.ini -notify_nova_on_port_data_changes = False -notify_nova_on_port_status_changes = False - -[agent] -root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf -root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf - -[database] -max_pool_size = 10 -max_overflow = 20 -pool_timeout = 10 diff --git a/centos7/rpm/SOURCES/neutron-l3-agent.service b/centos7/rpm/SOURCES/neutron-l3-agent.service index 2c9f291b2..c1bb08fb6 100644 --- a/centos7/rpm/SOURCES/neutron-l3-agent.service +++ b/centos7/rpm/SOURCES/neutron-l3-agent.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=simple User=neutron -ExecStart=/usr/bin/neutron-l3-agent --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-l3-agent --log-file /var/log/neutron/l3-agent.log +ExecStart=/usr/bin/neutron-l3-agent --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-l3-agent --log-file /var/log/neutron/l3-agent.log PrivateTmp=false KillMode=process diff --git a/centos7/rpm/SOURCES/neutron-linuxbridge-agent.service b/centos7/rpm/SOURCES/neutron-linuxbridge-agent.service index e647962bd..e4c781a34 100644 --- a/centos7/rpm/SOURCES/neutron-linuxbridge-agent.service +++ b/centos7/rpm/SOURCES/neutron-linuxbridge-agent.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=simple User=neutron -ExecStart=/usr/bin/neutron-linuxbridge-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/linuxbridge_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-linuxbridge-agent --log-file /var/log/neutron/linuxbridge-agent.log +ExecStart=/usr/bin/neutron-linuxbridge-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/linuxbridge_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-linuxbridge-agent --log-file /var/log/neutron/linuxbridge-agent.log PrivateTmp=true KillMode=process diff --git a/centos7/rpm/SOURCES/neutron-metadata-agent.service b/centos7/rpm/SOURCES/neutron-metadata-agent.service index 43bd940c5..d5c82c39b 100644 --- a/centos7/rpm/SOURCES/neutron-metadata-agent.service +++ b/centos7/rpm/SOURCES/neutron-metadata-agent.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=simple User=neutron -ExecStart=/usr/bin/neutron-metadata-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-metadata-agent --log-file /var/log/neutron/metadata-agent.log +ExecStart=/usr/bin/neutron-metadata-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-metadata-agent --log-file /var/log/neutron/metadata-agent.log PrivateTmp=false KillMode=process diff --git a/centos7/rpm/SOURCES/neutron-metering-agent.service b/centos7/rpm/SOURCES/neutron-metering-agent.service index 703864e43..d7caf2d67 100644 --- a/centos7/rpm/SOURCES/neutron-metering-agent.service +++ b/centos7/rpm/SOURCES/neutron-metering-agent.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=simple User=neutron -ExecStart=/usr/bin/neutron-metering-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metering_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-metering-agent --log-file /var/log/neutron/metering-agent.log +ExecStart=/usr/bin/neutron-metering-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metering_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-metering-agent --log-file /var/log/neutron/metering-agent.log PrivateTmp=false KillMode=process diff --git a/centos7/rpm/SOURCES/neutron-mlnx-agent.service b/centos7/rpm/SOURCES/neutron-mlnx-agent.service index 3eb1850ed..66f242aff 100644 --- a/centos7/rpm/SOURCES/neutron-mlnx-agent.service +++ b/centos7/rpm/SOURCES/neutron-mlnx-agent.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=simple User=neutron -ExecStart=/usr/bin/neutron-mlnx-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/mlnx/mlnx_conf.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-mlnx-agent --log-file /var/log/neutron/mlnx-agent.log +ExecStart=/usr/bin/neutron-mlnx-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/mlnx/mlnx_conf.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-mlnx-agent --log-file /var/log/neutron/mlnx-agent.log PrivateTmp=true KillMode=process diff --git a/centos7/rpm/SOURCES/neutron-netns-cleanup.init b/centos7/rpm/SOURCES/neutron-netns-cleanup.init index f7b921bcf..1a77b01cd 100644 --- a/centos7/rpm/SOURCES/neutron-netns-cleanup.init +++ b/centos7/rpm/SOURCES/neutron-netns-cleanup.init @@ -21,7 +21,6 @@ proj=neutron prog=$proj-netns-cleanup exec="/usr/bin/$prog" configs=( - "/usr/share/$proj/$proj-dist.conf" \ "/etc/$proj/$proj.conf" \ "/etc/$proj/dhcp_agent.ini" ) diff --git a/centos7/rpm/SOURCES/neutron-netns-cleanup.service b/centos7/rpm/SOURCES/neutron-netns-cleanup.service index 7a730e4b7..f14fcd805 100644 --- a/centos7/rpm/SOURCES/neutron-netns-cleanup.service +++ b/centos7/rpm/SOURCES/neutron-netns-cleanup.service @@ -6,8 +6,8 @@ Before=neutron-openvswitch-agent.service neutron-dhcp-agent.service neutron-l3-a [Service] Type=oneshot User=neutron -ExecStart=/usr/bin/neutron-netns-cleanup --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-netns-cleanup --log-file /var/log/neutron/netns-cleanup.log -ExecStop=/usr/bin/neutron-netns-cleanup --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-netns-cleanup --log-file /var/log/neutron/netns-cleanup.log --force +ExecStart=/usr/bin/neutron-netns-cleanup --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-netns-cleanup --log-file /var/log/neutron/netns-cleanup.log +ExecStop=/usr/bin/neutron-netns-cleanup --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-netns-cleanup --log-file /var/log/neutron/netns-cleanup.log --force PrivateTmp=false RemainAfterExit=yes diff --git a/centos7/rpm/SOURCES/neutron-openvswitch-agent.service b/centos7/rpm/SOURCES/neutron-openvswitch-agent.service index d632ff196..a3effe266 100644 --- a/centos7/rpm/SOURCES/neutron-openvswitch-agent.service +++ b/centos7/rpm/SOURCES/neutron-openvswitch-agent.service @@ -6,7 +6,7 @@ PartOf=network.service [Service] Type=simple User=neutron -ExecStart=/usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-openvswitch-agent --log-file /var/log/neutron/openvswitch-agent.log +ExecStart=/usr/bin/neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-openvswitch-agent --log-file /var/log/neutron/openvswitch-agent.log PrivateTmp=true KillMode=process diff --git a/centos7/rpm/SOURCES/neutron-ovs-cleanup.init b/centos7/rpm/SOURCES/neutron-ovs-cleanup.init index 9b6906f75..654fc4d59 100644 --- a/centos7/rpm/SOURCES/neutron-ovs-cleanup.init +++ b/centos7/rpm/SOURCES/neutron-ovs-cleanup.init @@ -22,7 +22,6 @@ prog=$proj-ovs-cleanup exec="/usr/bin/$prog" pidfile="/var/run/$proj/$prog.pid" configs=( - "/usr/share/$proj/$proj-dist.conf" \ "/etc/$proj/$proj.conf" \ "/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" \ ) diff --git a/centos7/rpm/SOURCES/neutron-ovs-cleanup.service b/centos7/rpm/SOURCES/neutron-ovs-cleanup.service index 5dfc89bdb..cfac2c7cc 100644 --- a/centos7/rpm/SOURCES/neutron-ovs-cleanup.service +++ b/centos7/rpm/SOURCES/neutron-ovs-cleanup.service @@ -6,8 +6,8 @@ Before=neutron-openvswitch-agent.service neutron-dhcp-agent.service neutron-l3-a [Service] Type=oneshot User=neutron -ExecStart=/usr/bin/neutron-ovs-cleanup --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-ovs-cleanup --log-file /var/log/neutron/ovs-cleanup.log -ExecStop=/usr/bin/neutron-ovs-cleanup --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-ovs-cleanup --log-file /var/log/neutron/ovs-cleanup.log +ExecStart=/usr/bin/neutron-ovs-cleanup --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-ovs-cleanup --log-file /var/log/neutron/ovs-cleanup.log +ExecStop=/usr/bin/neutron-ovs-cleanup --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-ovs-cleanup --log-file /var/log/neutron/ovs-cleanup.log PrivateTmp=true RemainAfterExit=yes diff --git a/centos7/rpm/SOURCES/neutron-rpc-server.service b/centos7/rpm/SOURCES/neutron-rpc-server.service index b3f4d181b..81b20486f 100644 --- a/centos7/rpm/SOURCES/neutron-rpc-server.service +++ b/centos7/rpm/SOURCES/neutron-rpc-server.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=notify User=neutron -ExecStart=/usr/bin/neutron-rpc-server --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-rpc-server --log-file /var/log/neutron/rpc-server.log +ExecStart=/usr/bin/neutron-rpc-server --config-dir /usr/share/neutron/server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-rpc-server --log-file /var/log/neutron/rpc-server.log PrivateTmp=true NotifyAccess=all KillMode=process diff --git a/centos7/rpm/SOURCES/neutron-server.service b/centos7/rpm/SOURCES/neutron-server.service index 17e107e44..925822841 100644 --- a/centos7/rpm/SOURCES/neutron-server.service +++ b/centos7/rpm/SOURCES/neutron-server.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=notify User=neutron -ExecStart=/usr/bin/neutron-server --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-server --log-file /var/log/neutron/server.log +ExecStart=/usr/bin/neutron-server --config-dir /usr/share/neutron/server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-server --log-file /var/log/neutron/server.log PrivateTmp=true NotifyAccess=all KillMode=process diff --git a/centos7/rpm/SOURCES/neutron-sriov-nic-agent.service b/centos7/rpm/SOURCES/neutron-sriov-nic-agent.service index 6d50aa6f1..b348a5be6 100644 --- a/centos7/rpm/SOURCES/neutron-sriov-nic-agent.service +++ b/centos7/rpm/SOURCES/neutron-sriov-nic-agent.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=simple User=neutron -ExecStart=/usr/bin/neutron-sriov-nic-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/sriov_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-sriov-nic-agent --log-file /var/log/neutron/sriov-nic-agent.log +ExecStart=/usr/bin/neutron-sriov-nic-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/sriov_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-sriov-nic-agent --log-file /var/log/neutron/sriov-nic-agent.log PrivateTmp=false KillMode=process diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec index e577ef82d..4d1410f65 100644 --- a/centos7/rpm/SPECS/openstack-neutron.spec +++ b/centos7/rpm/SPECS/openstack-neutron.spec @@ -28,7 +28,6 @@ Source24: neutron-ovs-cleanup.init Source28: neutron-dev-server.service Source29: neutron-rpc-server.service -Source30: %{service}-dist.conf Source31: conf.README BuildArch: noarch @@ -461,22 +460,6 @@ rm -rf neutron.egg-info export SKIP_PIP_INSTALL=1 %{__python2} setup.py build -# Loop through values in neutron-dist.conf and make sure that the values -# are substituted into the neutron.conf as comments. Some of these values -# will have been uncommented as a way of upstream setting defaults outside -# of the code. For notification_driver, there are commented examples -# above uncommented settings, so this specifically skips those comments -# and instead comments out the actual settings and substitutes the -# correct default values. -while read name eq value; do - test "$name" && test "$value" || continue - if [ "$name" = "notification_driver" ]; then - sed -ri "0,/^$name *=/{s!^$name *=.*!# $name = $value!}" etc/%{service}.conf - else - sed -ri "0,/^(#)? *$name *=/{s!^(#)? *$name *=.*!# $name = $value!}" etc/%{service}.conf - fi -done < %{SOURCE30} - %install # pbr does not like dashes in version strings, neither it likes fc* prefixes (dev* is fine) #export PBR_VERSION=%{version}.%(echo %{release} | sed 's/%{?dist}//') @@ -540,9 +523,6 @@ install -d -m 755 %{buildroot}%{_sharedstatedir}/%{service} install -d -m 755 %{buildroot}%{_localstatedir}/log/%{service} install -d -m 755 %{buildroot}%{_localstatedir}/run/%{service} -# Install dist conf -install -p -D -m 640 %{SOURCE30} %{buildroot}%{_datadir}/%{service}/%{service}-dist.conf - # Create and populate configuration directory for L3 agent that is not accessible for user modification mkdir -p %{buildroot}%{_datadir}/%{service}/l3_agent ln -s %{_sysconfdir}/%{service}/l3_agent.ini %{buildroot}%{_datadir}/%{service}/l3_agent/l3_agent.conf @@ -737,7 +717,6 @@ fi %dir %{_sysconfdir}/%{service}/conf.d %dir %{_sysconfdir}/%{service}/conf.d/common %dir %{_sysconfdir}/%{service}/plugins -%attr(-, root, %{service}) %{_datadir}/%{service}/%{service}-dist.conf %config(noreplace) %attr(0640, root, %{service}) %{_sysconfdir}/%{service}/%{service}.conf %config(noreplace) %{_sysconfdir}/%{service}/rootwrap.conf %config(noreplace) %{_sysconfdir}/logrotate.d/* @@ -899,6 +878,8 @@ fi %changelog +* Fri Nov 20 2015 Sergey Kolekonov 7.0.0 +- Remove neutron-dist.conf from packages * Fri Nov 6 2015 Sergey Kolekonov 7.0.0 - Update specs for 7.0.0 release * Thu Sep 3 2015 Sergey Kolekonov 7.0.0.0b3 -- 2.32.3