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

diff --git a/centos7/rpm/SOURCES/neutron-dev-server.service b/centos7/rpm/SOURCES/neutron-dev-server.service
index e971c9022e336fdf2c70c728c7f804338114805e..b7112951e1787632efa6a4f61892666b2c5208ce 100644 (file)
--- 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 c03daa218853a00f2e8e3db5c1c9052c896e5695..2a87073de8e6bf238c1277e12b13833bc5e4fa05 100644 (file)
--- 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 (file)
index 479da8e..0000000
--- 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 2c9f291b28c8c9e6cd70f806eb6bde2c86caa600..c1bb08fb6ce8ae580b25abbcee89b1ea28d23acf 100644 (file)
--- 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 e647962bd4f7e1f709fa0962512810fa770decec..e4c781a347f452c40007e6f86c77acb1bd43c2a7 100644 (file)
--- 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 43bd940c5a193e3fafbb931668438fae748cfbb7..d5c82c39b5b00a44cccd5e7960eaf03ea88f8314 100644 (file)
--- 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 703864e43fced3e34ebab8fbbe7f38840c675e9e..d7caf2d6747a1f4f99518e7e00b619157e712b8a 100644 (file)
--- 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 3eb1850ed89cae2f010e1944a336c29d8080ffd4..66f242aff55c10baa10325e37304340b6fe025f6 100644 (file)
--- 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 f7b921bcf96bf2b8b20d531c48d93788b27f2775..1a77b01cda66885aceebf2c5ee55a453125ea6ba 100644 (file)
--- 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 7a730e4b741cd25f5dc8e05efa2eadbd69c309f4..f14fcd805f4f7f9e75d95fc851420af4840db89c 100644 (file)
--- 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 d632ff19663df7440d83afdde88db84df100cf1b..a3effe26615d999dd7f5cf7fa4b8a0aac2c4bac0 100644 (file)
--- 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 9b6906f7500e383e851c61f2ce5679fdba5bee12..654fc4d5901143b236793458ea189298b50e251a 100644 (file)
--- 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 5dfc89bdb88bbccafa1d14a9eaaa9c525c03759f..cfac2c7cc8b6e697391c41ab1da7ffea3fdb7eb8 100644 (file)
--- 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 b3f4d181ba428ec963c6d040ccbe6c65e854d04e..81b20486f7c8b9fdcd386c9be5c7e133730578f8 100644 (file)
--- 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 17e107e44a45b4b9e1de0f70b1ad3c58ed97e6eb..9258228417bc0726fa1f3de472c03a3de078f364 100644 (file)
--- 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 6d50aa6f178798796635a2c859f6b3868c44f9e3..b348a5be61ed979081147b51d1a489426c30c6ee 100644 (file)
--- 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 e577ef82d3ad42f17acae24856e89a33bf5f3506..4d1410f65bfe40405ed8d0f738e93a28da827692 100644 (file)
--- 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 <skolekonov@mirantis.com> 7.0.0
+- Remove neutron-dist.conf from packages
 * Fri Nov 6 2015 Sergey Kolekonov <skolekonov@mirantis.com> 7.0.0
 - Update specs for 7.0.0 release
 * Thu Sep 3 2015 Sergey Kolekonov <skolekonov@mirantis.com> 7.0.0.0b3