commit 959fbe0ef6f2ab9faf83ee736b4fc0a92276f388
Author: Terry Wilson <twilson(a)redhat.com>
Date: Mon Sep 30 15:20:47 2013 -0500
Add support for neutron-dist.conf
neutron-dhcp-agent.service | 2 +-
neutron-dist.conf | 29 +++++++++++++++++++++++
neutron-l3-agent.service | 2 +-
neutron-lbaas-agent.service | 2 +-
neutron-linuxbridge-agent.service | 2 +-
neutron-metadata-agent.service | 2 +-
neutron-mlnx-agent.service | 2 +-
neutron-nec-agent.service | 2 +-
neutron-openvswitch-agent.service | 2 +-
neutron-ovs-cleanup.service | 2 +-
neutron-ryu-agent.service | 2 +-
neutron-server.service | 2 +-
openstack-neutron.spec | 45 ++++++++++++++++++++++--------------
13 files changed, 67 insertions(+), 29 deletions(-)
---
diff --git a/neutron-dhcp-agent.service b/neutron-dhcp-agent.service
index 49cbb3d..211b296 100644
--- a/neutron-dhcp-agent.service
+++ b/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 /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --log-file /var/log/neutron/dhcp-agent.log
+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 --log-file /var/log/neutron/dhcp-agent.log
PrivateTmp=false
[Install]
diff --git a/neutron-dist.conf b/neutron-dist.conf
new file mode 100644
index 0000000..9b1a635
--- /dev/null
+++ b/neutron-dist.conf
@@ -0,0 +1,29 @@
+[DEFAULT]
+verbose = True
+lock_path = $state_path/lock
+auth_strategy = noauth
+notification_driver = neutron.openstack.common.notifier.rpc_notifier
+rpc_backend = quantum.openstack.common.rpc.impl_qpid
+allow_overlapping_ips = True
+
+[quotas]
+
+[agent]
+root_helper = sudo quantum-rootwrap /etc/quantum/rootwrap.conf
+
+[keystone_authtoken]
+auth_host = 127.0.0.1
+auth_port = 35357
+auth_protocol = http
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%
+signing_dir = $state_path/keystone-signing
+
+[database]
+max_pool_size = 10
+max_overflow = 20
+pool_timeout = 10
+
+[service_providers]
+service_provider = LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
diff --git a/neutron-l3-agent.service b/neutron-l3-agent.service
index 6a74f70..756feef 100644
--- a/neutron-l3-agent.service
+++ b/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 /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --log-file /var/log/neutron/l3-agent.log
+ExecStart=/usr/bin/neutron-l3-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --log-file /var/log/neutron/l3-agent.log
PrivateTmp=false
[Install]
diff --git a/neutron-lbaas-agent.service b/neutron-lbaas-agent.service
index 59dd241..e784ecb 100644
--- a/neutron-lbaas-agent.service
+++ b/neutron-lbaas-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=neutron
-ExecStart=/usr/bin/neutron-lbaas-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --log-file /var/log/neutron/lbaas-agent.log
+ExecStart=/usr/bin/neutron-lbaas-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/lbaas_agent.ini --log-file /var/log/neutron/lbaas-agent.log
PrivateTmp=false
[Install]
diff --git a/neutron-linuxbridge-agent.service b/neutron-linuxbridge-agent.service
index 50c6fb3..3ee92b0 100644
--- a/neutron-linuxbridge-agent.service
+++ b/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 /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --log-file /var/log/neutron/linuxbridge-agent.log
+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/linuxbridge/linuxbridge_conf.ini --log-file /var/log/neutron/linuxbridge-agent.log
PrivateTmp=true
[Install]
diff --git a/neutron-metadata-agent.service b/neutron-metadata-agent.service
index 337eff9..22852c0 100644
--- a/neutron-metadata-agent.service
+++ b/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 /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini --log-file /var/log/neutron/metadata-agent.log
+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 --log-file /var/log/neutron/metadata-agent.log
PrivateTmp=false
[Install]
diff --git a/neutron-mlnx-agent.service b/neutron-mlnx-agent.service
index c0b7946..f41ce82 100644
--- a/neutron-mlnx-agent.service
+++ b/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 /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/mlnx/mlnx.ini --log-file /var/log/neutron/mlnx-agent.log
+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.ini --log-file /var/log/neutron/mlnx-agent.log
PrivateTmp=true
[Install]
diff --git a/neutron-nec-agent.service b/neutron-nec-agent.service
index cc18c62..eedcb12 100644
--- a/neutron-nec-agent.service
+++ b/neutron-nec-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=neutron
-ExecStart=/usr/bin/neutron-nec-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/nec/nec.ini --log-file /var/log/neutron/nec-agent.log
+ExecStart=/usr/bin/neutron-nec-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/nec/nec.ini --log-file /var/log/neutron/nec-agent.log
PrivateTmp=true
[Install]
diff --git a/neutron-openvswitch-agent.service b/neutron-openvswitch-agent.service
index a3eb5e0..0235b69 100644
--- a/neutron-openvswitch-agent.service
+++ b/neutron-openvswitch-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=neutron
-ExecStart=/usr/bin/neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file /var/log/neutron/openvswitch-agent.log
+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/openvswitch/ovs_neutron_plugin.ini --log-file /var/log/neutron/openvswitch-agent.log
PrivateTmp=true
[Install]
diff --git a/neutron-ovs-cleanup.service b/neutron-ovs-cleanup.service
index b8f4001..4c1b4ee 100644
--- a/neutron-ovs-cleanup.service
+++ b/neutron-ovs-cleanup.service
@@ -6,7 +6,7 @@ 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 /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file /var/log/neutron/ovs-cleanup.log
+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 --log-file /var/log/neutron/ovs-cleanup.log
PrivateTmp=true
[Install]
diff --git a/neutron-ryu-agent.service b/neutron-ryu-agent.service
index d4b006c..af84110 100644
--- a/neutron-ryu-agent.service
+++ b/neutron-ryu-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=neutron
-ExecStart=/usr/bin/neutron-ryu-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ryu/ryu.ini --log-file /var/log/neutron/ryu-agent.log
+ExecStart=/usr/bin/neutron-ryu-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ryu/ryu.ini --log-file /var/log/neutron/ryu-agent.log
PrivateTmp=true
[Install]
diff --git a/neutron-server.service b/neutron-server.service
index 849fe99..20feb40 100644
--- a/neutron-server.service
+++ b/neutron-server.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=neutron
-ExecStart=/usr/bin/neutron-server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --log-file /var/log/neutron/server.log
+ExecStart=/usr/bin/neutron-server --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --log-file /var/log/neutron/server.log
PrivateTmp=true
[Install]
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index f7df91a..04b5956 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
Name: openstack-neutron
Version: 2013.2
-Release: 0.9.b3%{?dist}
+Release: 0.10.b3%{?dist}
Provides: openstack-quantum = %{version}-%{release}
Obsoletes: openstack-quantum < 2013.2-0.4.b3
Summary: OpenStack Networking Service
@@ -19,7 +19,6 @@ Source4: neutron-server-setup
Source5: neutron-node-setup
Source6: neutron-dhcp-setup
Source7: neutron-l3-setup
-
Source10: neutron-server.service
Source11: neutron-linuxbridge-agent.service
Source12: neutron-openvswitch-agent.service
@@ -32,6 +31,7 @@ Source18: neutron-ovs-cleanup.service
Source19: neutron-lbaas-agent.service
Source20: neutron-mlnx-agent.service
+Source30: neutron-dist.conf
#
# patches_base=2013.2.b3
#
@@ -386,24 +386,29 @@ IPSec.
%prep
%setup -q -n neutron-%{version}.b3
-
-sed -i 's/%{version}/%{version}/' PKG-INFO
-
find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
-# let RPM handle deps
-sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
-
chmod 644 neutron/plugins/cisco/README
-# Adjust configuration file content
-sed -i 's/debug = True/debug = False/' etc/neutron.conf
-sed -i 's/\# auth_strategy = keystone/auth_strategy = noauth/' etc/neutron.conf
-
%build
%{__python} 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 service_provider and 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" = "service_provider" -o "$name" = "notification_driver" ]; then
+ sed -ri "0,/^$name *=/{s!^$name *=.*!# $name = $value!}" etc/neutron.conf
+ else
+ sed -ri "0,/^(#)? *$name *=/{s!^(#)? *$name *=.*!# $name = $value!}" etc/neutron.conf
+ fi
+done < %{SOURCE30}
%install
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
@@ -426,12 +431,6 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/neutron
mv %{buildroot}/usr/etc/neutron/* %{buildroot}%{_sysconfdir}/neutron
chmod 640 %{buildroot}%{_sysconfdir}/neutron/plugins/*/*.ini
-# Configure agents to use neutron-rootwrap
-sed -i 's/^# root_helper.*/root_helper = sudo neutron-rootwrap \/etc\/neutron\/rootwrap.conf/g' %{buildroot}%{_sysconfdir}/neutron/neutron.conf
-
-# Configure neutron-dhcp-agent state_path
-sed -i 's/state_path = \/opt\/stack\/data/state_path = \/var\/lib\/neutron/' %{buildroot}%{_sysconfdir}/neutron/dhcp_agent.ini
-
# Install logrotate
install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-neutron
@@ -461,6 +460,9 @@ install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/neutron-node-setup
install -p -D -m 755 %{SOURCE6} %{buildroot}%{_bindir}/neutron-dhcp-setup
install -p -D -m 755 %{SOURCE7} %{buildroot}%{_bindir}/neutron-l3-setup
+# Install dist conf
+install -p -D -m 640 %{SOURCE30} %{buildroot}%{_datadir}/neutron/neutron-dist.conf
+
# Install version info file
cat > %{buildroot}%{_sysconfdir}/neutron/release <<EOF
[Quantum]
@@ -631,6 +633,7 @@ fi
%{_unitdir}/neutron-server.service
%dir %{_sysconfdir}/neutron
%{_sysconfdir}/neutron/release
+%attr(-, root, neutron) %{_datadir}/neutron/neutron-dist.conf
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/api-paste.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/dhcp_agent.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/l3_agent.ini
@@ -810,17 +813,23 @@ fi
%dir %{_sysconfdir}/neutron/plugins/metaplugin
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/metaplugin/*.ini
+
%files -n openstack-neutron-metering-agent
%doc LICENSE
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/metering_agent.ini
%{_bindir}/neutron-metering-agent
+
%files -n openstack-neutron-vpn-agent
%doc LICENSE
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/vpn_agent.ini
%{_bindir}/neutron-vpn-agent
+
%changelog
+* Thu Sep 26 2013 Terry Wilson <twilson(a)redhat.com> - 2013.2-0.10.b3
+- Add support for neutron-dist.conf
+
* Tue Sep 17 2013 Pádraig Brady <pbrady(a)redhat.com> - 2013.2-0.9.b3
- Fix typo in openstack-neutron-meetering-agent package name
