From 6d59a95c140c8242a84ae91300fd2657a0e0887c Mon Sep 17 00:00:00 2001 From: Sergey Otpuschennikov Date: Mon, 28 Oct 2013 16:11:22 +0400 Subject: [PATCH] Added new specfile Change-Id: I5f778ed64ab435026f46cd1fc271b96f2bc7b283 --- rpm/SOURCES/neutron-dhcp-agent.init | 14 +- rpm/SOURCES/neutron-dhcp-agent.upstart | 2 +- rpm/SOURCES/neutron-dist.conf | 29 ++++ rpm/SOURCES/neutron-l3-agent.init | 14 +- rpm/SOURCES/neutron-l3-agent.upstart | 2 +- rpm/SOURCES/neutron-lbaas-agent.init | 14 +- rpm/SOURCES/neutron-lbaas-agent.upstart | 2 +- rpm/SOURCES/neutron-linuxbridge-agent.init | 14 +- rpm/SOURCES/neutron-linuxbridge-agent.upstart | 2 +- rpm/SOURCES/neutron-metadata-agent.init | 14 +- rpm/SOURCES/neutron-metadata-agent.upstart | 2 +- rpm/SOURCES/neutron-metering-agent.init | 100 ++++++++++++ rpm/SOURCES/neutron-metering-agent.upstart | 8 + rpm/SOURCES/neutron-mlnx-agent.init | 14 +- rpm/SOURCES/neutron-mlnx-agent.upstart | 2 +- rpm/SOURCES/neutron-nec-agent.init | 14 +- rpm/SOURCES/neutron-nec-agent.upstart | 2 +- rpm/SOURCES/neutron-openvswitch-agent.init | 14 +- rpm/SOURCES/neutron-openvswitch-agent.upstart | 2 +- rpm/SOURCES/neutron-ovs-cleanup.init | 14 +- rpm/SOURCES/neutron-ovs-cleanup.upstart | 2 +- rpm/SOURCES/neutron-ryu-agent.init | 14 +- rpm/SOURCES/neutron-ryu-agent.upstart | 2 +- rpm/SOURCES/neutron-server.init | 14 +- rpm/SOURCES/neutron-server.upstart | 2 +- rpm/SOURCES/neutron-vpn-agent.init | 100 ++++++++++++ rpm/SOURCES/neutron-vpn-agent.upstart | 8 + rpm/SPECS/openstack-neutron.spec | 145 ++++++++++++++---- 28 files changed, 477 insertions(+), 89 deletions(-) create mode 100644 rpm/SOURCES/neutron-dist.conf create mode 100644 rpm/SOURCES/neutron-metering-agent.init create mode 100644 rpm/SOURCES/neutron-metering-agent.upstart create mode 100644 rpm/SOURCES/neutron-vpn-agent.init create mode 100644 rpm/SOURCES/neutron-vpn-agent.upstart diff --git a/rpm/SOURCES/neutron-dhcp-agent.init b/rpm/SOURCES/neutron-dhcp-agent.init index e7ebd96e5..ef93ac2f5 100644 --- a/rpm/SOURCES/neutron-dhcp-agent.init +++ b/rpm/SOURCES/neutron-dhcp-agent.init @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # neutron-dhcp-agent OpenStack Neutron DHCP Agent # @@ -12,7 +12,11 @@ proj=neutron plugin=dhcp-agent prog=$proj-$plugin exec="/usr/bin/$prog" -config="/etc/$proj/dhcp_agent.ini" +configs=( + "/usr/share/$proj/$proj-dist.conf" \ + "/etc/$proj/$proj.conf" \ + "/etc/$proj/dhcp_agent.ini" \ +) pidfile="/var/run/$proj/$prog.pid" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -21,9 +25,11 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done echo -n $"Starting $prog: " - daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null & echo \$! > $pidfile" + daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/neutron-dhcp-agent.upstart b/rpm/SOURCES/neutron-dhcp-agent.upstart index 138748c6d..97c4c145f 100644 --- a/rpm/SOURCES/neutron-dhcp-agent.upstart +++ b/rpm/SOURCES/neutron-dhcp-agent.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /usr/bin/neutron-dhcp-agent --log-file /var/log/neutron/dhcp-agent.log --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini" neutron +exec su -s /bin/sh -c "exec /usr/bin/neutron-dhcp-agent --log-file /var/log/neutron/dhcp-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini" neutron diff --git a/rpm/SOURCES/neutron-dist.conf b/rpm/SOURCES/neutron-dist.conf new file mode 100644 index 000000000..9b1a6358c --- /dev/null +++ b/rpm/SOURCES/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/rpm/SOURCES/neutron-l3-agent.init b/rpm/SOURCES/neutron-l3-agent.init index dc7dc3ef5..0e241f84c 100644 --- a/rpm/SOURCES/neutron-l3-agent.init +++ b/rpm/SOURCES/neutron-l3-agent.init @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # neutron-l3-agent OpenStack Neutron Layer 3 Agent # @@ -12,7 +12,11 @@ proj=neutron plugin=l3-agent prog=$proj-$plugin exec="/usr/bin/$prog" -config="/etc/$proj/l3_agent.ini" +configs=( + "/usr/share/$proj/$proj-dist.conf" \ + "/etc/$proj/$proj.conf" \ + "/etc/$proj/l3_agent.ini" \ +) pidfile="/var/run/$proj/$prog.pid" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -21,9 +25,11 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done echo -n $"Starting $prog: " - daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null & echo \$! > $pidfile" + daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/neutron-l3-agent.upstart b/rpm/SOURCES/neutron-l3-agent.upstart index e09bfc89b..35e1d3261 100644 --- a/rpm/SOURCES/neutron-l3-agent.upstart +++ b/rpm/SOURCES/neutron-l3-agent.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /usr/bin/neutron-l3-agent --log-file /var/log/neutron/l3-agent.log --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini" neutron +exec su -s /bin/sh -c "exec /usr/bin/neutron-l3-agent --log-file /var/log/neutron/l3-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini" neutron diff --git a/rpm/SOURCES/neutron-lbaas-agent.init b/rpm/SOURCES/neutron-lbaas-agent.init index 0d111d072..31ac1ce6a 100644 --- a/rpm/SOURCES/neutron-lbaas-agent.init +++ b/rpm/SOURCES/neutron-lbaas-agent.init @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # neutron-lbaas-agent OpenStack Neutron LBaaS Agent # @@ -12,7 +12,11 @@ proj=neutron plugin=lbaas-agent prog=$proj-$plugin exec="/usr/bin/$prog" -config="/etc/$proj/lbaas_agent.ini" +configs=( + "/usr/share/$proj/$proj-dist.conf" \ + "/etc/$proj/$proj.conf" \ + "/etc/$proj/lbaas_agent.ini" \ +) pidfile="/var/run/$proj/$prog.pid" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -21,9 +25,11 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done echo -n $"Starting $prog: " - daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null & echo \$! > $pidfile" + daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/neutron-lbaas-agent.upstart b/rpm/SOURCES/neutron-lbaas-agent.upstart index 7e0bd0563..7d9d61c00 100644 --- a/rpm/SOURCES/neutron-lbaas-agent.upstart +++ b/rpm/SOURCES/neutron-lbaas-agent.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /usr/bin/neutron-lbaas-agent --log-file /var/log/neutron/lbaas-agent.log --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/lbaas_agent.ini" neutron +exec su -s /bin/sh -c "exec /usr/bin/neutron-lbaas-agent --log-file /var/log/neutron/lbaas-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/lbaas_agent.ini" neutron diff --git a/rpm/SOURCES/neutron-linuxbridge-agent.init b/rpm/SOURCES/neutron-linuxbridge-agent.init index 95f686ba1..141a9750b 100644 --- a/rpm/SOURCES/neutron-linuxbridge-agent.init +++ b/rpm/SOURCES/neutron-linuxbridge-agent.init @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # neutron-linuxbridge-agent OpenStack linuxbridge plugin # @@ -12,7 +12,11 @@ proj=neutron plugin=linuxbridge-agent prog=$proj-$plugin exec="/usr/bin/$prog" -config="/etc/$proj/plugins/linuxbridge/linuxbridge_conf.ini" +configs=( + "/usr/share/$proj/$proj-dist.conf" \ + "/etc/$proj/$proj.conf" \ + "/etc/$proj/plugins/linuxbridge/linuxbridge_conf.ini" \ +) pidfile="/var/run/$proj/$prog.pid" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -21,9 +25,11 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done echo -n $"Starting $prog: " - daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null & echo \$! > $pidfile" + daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/neutron-linuxbridge-agent.upstart b/rpm/SOURCES/neutron-linuxbridge-agent.upstart index 1859ee46f..0a483a419 100644 --- a/rpm/SOURCES/neutron-linuxbridge-agent.upstart +++ b/rpm/SOURCES/neutron-linuxbridge-agent.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /usr/bin/neutron-linuxbridge-agent --log-file /var/log/neutron/linuxbridge-agent.log --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini" neutron +exec su -s /bin/sh -c "exec /usr/bin/neutron-linuxbridge-agent --log-file /var/log/neutron/linuxbridge-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini" neutron diff --git a/rpm/SOURCES/neutron-metadata-agent.init b/rpm/SOURCES/neutron-metadata-agent.init index 0555fe862..4a0384dea 100644 --- a/rpm/SOURCES/neutron-metadata-agent.init +++ b/rpm/SOURCES/neutron-metadata-agent.init @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # neutron-metadata-agent OpenStack Neutron Metadata Agent # @@ -12,7 +12,11 @@ proj=neutron plugin=metadata-agent prog=$proj-$plugin exec="/usr/bin/$prog" -config="/etc/$proj/metadata_agent.ini" +configs=( + "/usr/share/$proj/$proj-dist.conf" \ + "/etc/$proj/$proj.conf" \ + "/etc/$proj/metadata_agent.ini" \ +) pidfile="/var/run/$proj/$prog.pid" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -21,9 +25,11 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done echo -n $"Starting $prog: " - daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null & echo \$! > $pidfile" + daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/neutron-metadata-agent.upstart b/rpm/SOURCES/neutron-metadata-agent.upstart index 7ee7407da..dcb5bcb88 100644 --- a/rpm/SOURCES/neutron-metadata-agent.upstart +++ b/rpm/SOURCES/neutron-metadata-agent.upstart @@ -6,4 +6,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /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" neutron +exec su -s /bin/sh -c "exec /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" neutron diff --git a/rpm/SOURCES/neutron-metering-agent.init b/rpm/SOURCES/neutron-metering-agent.init new file mode 100644 index 000000000..8c7ab4f01 --- /dev/null +++ b/rpm/SOURCES/neutron-metering-agent.init @@ -0,0 +1,100 @@ +#!/bin/bash +# +# neutron-metering-agent OpenStack Neutron Metering Agent +# +# chkconfig: - 98 02 +# description: OpenStack Neutron Metering Agent +### END INIT INFO + +. /etc/rc.d/init.d/functions + +proj=neutron +plugin=metering-agent +prog=$proj-$plugin +exec="/usr/bin/$prog" +configs=( + "/usr/share/$proj/$proj-dist.conf" \ + "/etc/$proj/$proj.conf" \ + "/etc/$proj/metering_agent.ini" \ +) +pidfile="/var/run/$proj/$prog.pid" + +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +lockfile=/var/lock/subsys/$prog + +start() { + [ -x $exec ] || exit 5 + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done + echo -n $"Starting $prog: " + daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile" + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc -p $pidfile $prog + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + status -p $pidfile $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? diff --git a/rpm/SOURCES/neutron-metering-agent.upstart b/rpm/SOURCES/neutron-metering-agent.upstart new file mode 100644 index 000000000..7a7f8fd17 --- /dev/null +++ b/rpm/SOURCES/neutron-metering-agent.upstart @@ -0,0 +1,8 @@ +description "OpenStack Neutron Metering Agent" + +start on stopped rc RUNLEVEL=[2345] +stop on runlevel [S016] + +respawn + +exec su -s /bin/sh -c "exec /usr/bin/neutron-metering-agent --log-file /var/log/neutron/metering-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metering_agent.ini" neutron diff --git a/rpm/SOURCES/neutron-mlnx-agent.init b/rpm/SOURCES/neutron-mlnx-agent.init index 8db937b31..c19f33bfa 100644 --- a/rpm/SOURCES/neutron-mlnx-agent.init +++ b/rpm/SOURCES/neutron-mlnx-agent.init @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # neutron-mlnx-agent OpenStack Neutron Mellanox Agent # @@ -12,7 +12,11 @@ proj=neutron plugin=mlnx-agent prog=$proj-$plugin exec="/usr/bin/$prog" -config="/etc/$proj/plugins/mlnx/mlnx_conf.ini" +configs=( + "/usr/share/$proj/$proj-dist.conf" \ + "/etc/$proj/$proj.conf" \ + "/etc/$proj/plugins/mlnx/mlnx_conf.ini" \ +) pidfile="/var/run/$proj/$prog.pid" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -21,9 +25,11 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done echo -n $"Starting $prog: " - daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null & echo \$! > $pidfile" + daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/neutron-mlnx-agent.upstart b/rpm/SOURCES/neutron-mlnx-agent.upstart index a4986e03f..9e78cd5b2 100644 --- a/rpm/SOURCES/neutron-mlnx-agent.upstart +++ b/rpm/SOURCES/neutron-mlnx-agent.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /usr/bin/neutron-mlnx-agent --log-file /var/log/neutron/mlnx-agent.log --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/mlnx/mlnx_conf.ini" neutron +exec su -s /bin/sh -c "exec /usr/bin/neutron-mlnx-agent --log-file /var/log/neutron/mlnx-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/mlnx/mlnx_conf.ini" neutron diff --git a/rpm/SOURCES/neutron-nec-agent.init b/rpm/SOURCES/neutron-nec-agent.init index e99059e81..ff1b877f7 100644 --- a/rpm/SOURCES/neutron-nec-agent.init +++ b/rpm/SOURCES/neutron-nec-agent.init @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # neutron-nec-agent OpenStack Neutron NEC OpenFlow Agent # @@ -12,7 +12,11 @@ proj=neutron plugin=nec-agent prog=$proj-$plugin exec="/usr/bin/$prog" -config="/etc/$proj/plugins/nec/nec.ini" +configs=( + "/usr/share/$proj/$proj-dist.conf" \ + "/etc/$proj/$proj.conf" \ + "/etc/$proj/plugins/nec/nec.ini" \ +) pidfile="/var/run/$proj/$prog.pid" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -21,9 +25,11 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done echo -n $"Starting $prog: " - daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null & echo \$! > $pidfile" + daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/neutron-nec-agent.upstart b/rpm/SOURCES/neutron-nec-agent.upstart index 628df3319..4837a28f0 100644 --- a/rpm/SOURCES/neutron-nec-agent.upstart +++ b/rpm/SOURCES/neutron-nec-agent.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /usr/bin/neutron-nec-agent --log-file /var/log/neutron/nec-agent.log --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/nec/nec.ini" neutron +exec su -s /bin/sh -c "exec /usr/bin/neutron-nec-agent --log-file /var/log/neutron/nec-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/nec/nec.ini" neutron diff --git a/rpm/SOURCES/neutron-openvswitch-agent.init b/rpm/SOURCES/neutron-openvswitch-agent.init index 020781faa..14e53a9cb 100644 --- a/rpm/SOURCES/neutron-openvswitch-agent.init +++ b/rpm/SOURCES/neutron-openvswitch-agent.init @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # neutron-openvswitch-agent OpenStack Open vSwitch plugin # @@ -12,7 +12,11 @@ proj=neutron plugin=openvswitch-agent prog=$proj-$plugin exec="/usr/bin/$prog" -config="/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" +configs=( + "/usr/share/$proj/$proj-dist.conf" \ + "/etc/$proj/$proj.conf" \ + "/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" \ +) pidfile="/var/run/$proj/$prog.pid" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -21,9 +25,11 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done echo -n $"Starting $prog: " - daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null & echo \$! > $pidfile" + daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/neutron-openvswitch-agent.upstart b/rpm/SOURCES/neutron-openvswitch-agent.upstart index 080f0b857..52da4b0f0 100644 --- a/rpm/SOURCES/neutron-openvswitch-agent.upstart +++ b/rpm/SOURCES/neutron-openvswitch-agent.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /usr/bin/neutron-openvswitch-agent --log-file /var/log/neutron/openvswitch-agent.log --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini" neutron +exec su -s /bin/sh -c "exec /usr/bin/neutron-openvswitch-agent --log-file /var/log/neutron/openvswitch-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini" neutron diff --git a/rpm/SOURCES/neutron-ovs-cleanup.init b/rpm/SOURCES/neutron-ovs-cleanup.init index 970e9476e..8978cac4a 100644 --- a/rpm/SOURCES/neutron-ovs-cleanup.init +++ b/rpm/SOURCES/neutron-ovs-cleanup.init @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # neutron-ovs-cleanup OpenStack Open vSwitch cleanup utility # @@ -12,7 +12,11 @@ proj=neutron prog=$proj-ovs-cleanup exec="/usr/bin/$prog" pidfile="/var/run/$proj/$prog.pid" -config="/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" +configs=( + "/usr/share/$proj/$proj-dist.conf" \ + "/etc/$proj/$proj.conf" \ + "/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" \ +) [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -20,8 +24,10 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - daemon --user neutron $exec --log-file /var/log/$proj/ovs-cleanup.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done + daemon --user neutron $exec --log-file /var/log/$proj/ovs-cleanup.log ${configs[@]/#/--config-file } &>/dev/null retval=$? [ $retval -eq 0 ] && touch $lockfile return $retval diff --git a/rpm/SOURCES/neutron-ovs-cleanup.upstart b/rpm/SOURCES/neutron-ovs-cleanup.upstart index e07f7c978..addd0d1a0 100644 --- a/rpm/SOURCES/neutron-ovs-cleanup.upstart +++ b/rpm/SOURCES/neutron-ovs-cleanup.upstart @@ -4,4 +4,4 @@ start on stopped rc RUNLEVEL=[2345] task -exec su -s /bin/sh -c "exec /usr/bin/neutron-ovs-cleanup --log-file /var/log/neutron/ovs-cleanup.log --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini" neutron +exec su -s /bin/sh -c "exec /usr/bin/neutron-ovs-cleanup --log-file /var/log/neutron/ovs-cleanup.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini" neutron diff --git a/rpm/SOURCES/neutron-ryu-agent.init b/rpm/SOURCES/neutron-ryu-agent.init index 7a034e9e3..89dcaced8 100644 --- a/rpm/SOURCES/neutron-ryu-agent.init +++ b/rpm/SOURCES/neutron-ryu-agent.init @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # neutron-ryu-agent OpenStack Ryu Network OS plugin # @@ -12,7 +12,11 @@ proj=neutron plugin=ryu-agent prog=$proj-$plugin exec="/usr/bin/$prog" -config="/etc/$proj/plugins/ryu/ryu.ini" +configs=( + "/usr/share/$proj/$proj-dist.conf" \ + "/etc/$proj/$proj.conf" \ + "/etc/$proj/plugins/ryu/ryu.ini" \ +) pidfile="/var/run/$proj/$prog.pid" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -21,9 +25,11 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done echo -n $"Starting $prog: " - daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null & echo \$! > $pidfile" + daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/neutron-ryu-agent.upstart b/rpm/SOURCES/neutron-ryu-agent.upstart index 170759c7d..d596d9450 100644 --- a/rpm/SOURCES/neutron-ryu-agent.upstart +++ b/rpm/SOURCES/neutron-ryu-agent.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /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" neutron +exec su -s /bin/sh -c "exec /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" neutron diff --git a/rpm/SOURCES/neutron-server.init b/rpm/SOURCES/neutron-server.init index 36d792a8d..d5ccc9f0a 100644 --- a/rpm/SOURCES/neutron-server.init +++ b/rpm/SOURCES/neutron-server.init @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # neutron OpenStack Software Defined Networking Service # @@ -11,7 +11,11 @@ prog=neutron exec="/usr/bin/$prog-server" -config="/etc/$prog/$prog.conf" +configs=( + "/usr/share/$prog/$prog-dist.conf" \ + "/etc/$prog/$prog.conf" \ + "/etc/$prog/plugin.ini" \ +) pidfile="/var/run/$prog/$prog.pid" logfile="/var/log/$prog/server.log" @@ -21,9 +25,11 @@ lockfile=/var/lock/subsys/$prog-server start() { [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done echo -n $"Starting $prog: " - daemon --user neutron --pidfile $pidfile "$exec --config-file $config --config-file /etc/$prog/plugin.ini --log-file $logfile &>/dev/null & echo \$! > $pidfile" + daemon --user neutron --pidfile $pidfile "$exec ${configs[@]/#/--config-file } --log-file $logfile &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/neutron-server.upstart b/rpm/SOURCES/neutron-server.upstart index f93c20c83..ec14e41a0 100644 --- a/rpm/SOURCES/neutron-server.upstart +++ b/rpm/SOURCES/neutron-server.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /usr/bin/neutron-server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --log-file /var/log/neutron/server.log" neutron +exec su -s /bin/sh -c "exec /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" neutron diff --git a/rpm/SOURCES/neutron-vpn-agent.init b/rpm/SOURCES/neutron-vpn-agent.init new file mode 100644 index 000000000..6a5acfee2 --- /dev/null +++ b/rpm/SOURCES/neutron-vpn-agent.init @@ -0,0 +1,100 @@ +#!/bin/bash +# +# neutron-vpn-agent OpenStack Neutron VPN Agent +# +# chkconfig: - 98 02 +# description: OpenStack Neutron VPN Agent +### END INIT INFO + +. /etc/rc.d/init.d/functions + +proj=neutron +plugin=vpn-agent +prog=$proj-$plugin +exec="/usr/bin/$prog" +configs=( + "/usr/share/$proj/$proj-dist.conf" \ + "/etc/$proj/$proj.conf" \ + "/etc/$proj/vpn_agent.ini" \ +) +pidfile="/var/run/$proj/$prog.pid" + +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +lockfile=/var/lock/subsys/$prog + +start() { + [ -x $exec ] || exit 5 + for config in ${configs[@]}; do + [ -f $config ] || exit 6 + done + echo -n $"Starting $prog: " + daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile" + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc -p $pidfile $prog + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + status -p $pidfile $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? diff --git a/rpm/SOURCES/neutron-vpn-agent.upstart b/rpm/SOURCES/neutron-vpn-agent.upstart new file mode 100644 index 000000000..83c7a2d3d --- /dev/null +++ b/rpm/SOURCES/neutron-vpn-agent.upstart @@ -0,0 +1,8 @@ +description "OpenStack Neutron VPN Agent" + +start on stopped rc RUNLEVEL=[2345] +stop on runlevel [S016] + +respawn + +exec su -s /bin/sh -c "exec /usr/bin/neutron-vpn-agent --log-file /var/log/neutron/vpn-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/vpn_agent.ini" neutron diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec index 1b6d990f4..f8a4a6e6c 100644 --- a/rpm/SPECS/openstack-neutron.spec +++ b/rpm/SPECS/openstack-neutron.spec @@ -5,7 +5,7 @@ Name: openstack-neutron Version: 2013.2 -Release: 0.4.b3%{?dist} +Release: 1%{?dist} Provides: openstack-quantum = %{version}-%{release} Obsoletes: openstack-quantum < 2013.2-0.3.b3 @@ -15,8 +15,7 @@ Group: Applications/System License: ASL 2.0 URL: http://launchpad.net/neutron/ -#Source0: http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.tar.gz -Source0: http://launchpad.net/neutron/%{release_name}/%{release_name}-2/+download/neutron-%{version}.b3.tar.gz +Source0: http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.tar.gz Source1: neutron.logrotate Source2: neutron-sudoers Source4: neutron-server-setup @@ -46,9 +45,14 @@ Source19: neutron-lbaas-agent.init Source29: neutron-lbaas-agent.upstart Source30: neutron-mlnx-agent.init Source40: neutron-mlnx-agent.upstart +Source31: neutron-vpn-agent.init +Source41: neutron-vpn-agent.upstart +Source32: neutron-metering-agent.init +Source42: neutron-metering-agent.upstart +Source90: neutron-dist.conf # -# patches_base=2013.2.b3 +# patches_base=2013.2 # Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch @@ -383,13 +387,13 @@ This package contains the neutron plugin that implements virtual networks using multiple other neutron plugins. -%package -n openstack-neutron-meetering-agent +%package -n openstack-neutron-metering-agent Summary: Neutron bandwidth metering agent Group: Applications/System Requires: openstack-neutron = %{version}-%{release} -%description -n openstack-neutron-meetering-agent +%description -n openstack-neutron-metering-agent Neutron provides an API to measure bandwidth utilization This package contains the neutron agent responsible for generating bandwidth @@ -400,6 +404,7 @@ Summary: Neutron VPNaaS agent Group: Applications/System Requires: openstack-neutron = %{version}-%{release} +Requires: python-jinja2-26 %description -n openstack-neutron-vpn-agent Neutron provides an API to implement VPN as a service @@ -413,25 +418,31 @@ IPSec. %patch0001 -p1 -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 - # Let's handle dependencies ourseleves rm -f requirements.txt %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 < %{SOURCE90} %install %{__python} setup.py install -O1 --skip-build --root %{buildroot} @@ -454,12 +465,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 @@ -478,6 +483,8 @@ install -p -D -m 755 %{SOURCE17} %{buildroot}%{_initrddir}/neutron-metadata-agen install -p -D -m 755 %{SOURCE18} %{buildroot}%{_initrddir}/neutron-ovs-cleanup install -p -D -m 755 %{SOURCE19} %{buildroot}%{_initrddir}/neutron-lbaas-agent install -p -D -m 755 %{SOURCE30} %{buildroot}%{_initrddir}/neutron-mlnx-agent +install -p -D -m 755 %{SOURCE31} %{buildroot}%{_initrddir}/neutron-vpn-agent +install -p -D -m 755 %{SOURCE32} %{buildroot}%{_initrddir}/neutron-metering-agent # Setup directories install -d -m 755 %{buildroot}%{_datadir}/neutron @@ -503,6 +510,11 @@ install -p -m 644 %{SOURCE27} %{buildroot}%{_datadir}/neutron/ install -p -m 644 %{SOURCE28} %{buildroot}%{_datadir}/neutron/ install -p -m 644 %{SOURCE29} %{buildroot}%{_datadir}/neutron/ install -p -m 644 %{SOURCE40} %{buildroot}%{_datadir}/neutron/ +install -p -m 644 %{SOURCE41} %{buildroot}%{_datadir}/neutron/ +install -p -m 644 %{SOURCE42} %{buildroot}%{_datadir}/neutron/ + +# Install dist conf +install -p -D -m 640 %{SOURCE90} %{buildroot}%{_datadir}/neutron/neutron-dist.conf # Install version info file cat > %{buildroot}%{_sysconfdir}/neutron/release </dev/null 2>&1 /sbin/chkconfig --del neutron-server - /sbin/service neutron-dhcp-agent stop >/dev/null 2>&1 - /sbin/chkconfig --del neutron-dhcp-agent - /sbin/service neutron-l3-agent stop >/dev/null 2>&1 - /sbin/chkconfig --del neutron-l3-agent - /sbin/service neutron-metadata-agent stop >/dev/null 2>&1 - /sbin/chkconfig --del neutron-metadata-agent - /sbin/service neutron-lbaas-agent stop >/dev/null 2>&1 - /sbin/chkconfig --del neutron-lbaas-agent + for agent in dhcp l3 metadata lbaas; do + /sbin/service neutron-$agent-agent stop >/dev/null 2>&1 + /sbin/chkconfig --del neutron-$agent-agent + done fi %postun if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall /sbin/service neutron-server condrestart >/dev/null 2>&1 || : - /sbin/service neutron-dhcp-agent condrestart >/dev/null 2>&1 || : - /sbin/service neutron-l3-agent condrestart >/dev/null 2>&1 || : - /sbin/service neutron-metadata-agent condrestart >/dev/null 2>&1 || : - /sbin/service neutron-lbaas-agent condrestart >/dev/null 2>&1 || : + for agent in dhcp l3 metadata lbaas; do + /sbin/service neutron-$agent-agent condrestart >/dev/null 2>&1 || : + done fi @@ -612,6 +622,12 @@ if [ $1 -ge 1 ] ; then fi +%post -n openstack-neutron-nec +if [ $1 -eq 1 ] ; then + # Initial installation + /sbin/chkconfig --add neutron-nec-agent +fi + %preun -n openstack-neutron-nec if [ $1 -eq 0 ] ; then # Package removal, not upgrade @@ -648,6 +664,45 @@ if [ $1 -ge 1 ] ; then fi +%post -n openstack-neutron-vpn-agent +if [ $1 -eq 1 ] ; then + # Initial installation + /sbin/chkconfig --add neutron-vpn-agent +fi + +%preun -n openstack-neutron-vpn-agent +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /sbin/service neutron-vpn-agent stop >/dev/null 2>&1 + /sbin/chkconfig --del neutron-vpn-agent +fi + +%postun -n openstack-neutron-vpn-agent +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /sbin/service neutron-vpn-agent condrestart >/dev/null 2>&1 || : +fi + + +%post -n openstack-neutron-metering-agent +if [ $1 -eq 1 ] ; then + # Initial installation + /sbin/chkconfig --add neutron-metering-agent +fi + +%preun -n openstack-neutron-metering-agent +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /sbin/service neutron-metering-agent stop >/dev/null 2>&1 + /sbin/chkconfig --del neutron-metering-agent +fi + +%postun -n openstack-neutron-metering-agent +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /sbin/service neutron-metering-agent condrestart >/dev/null 2>&1 || : +fi + %files %doc LICENSE %doc README.rst @@ -695,6 +750,7 @@ fi %{_datadir}/neutron/neutron-lbaas-agent.upstart %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 @@ -881,19 +937,40 @@ fi %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/metaplugin/*.ini -%files -n openstack-neutron-meetering-agent +%files -n openstack-neutron-metering-agent %doc LICENSE %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/metering_agent.ini +%{_initrddir}/neutron-metering-agent +%{_datadir}/neutron/neutron-metering-agent.upstart %{_bindir}/neutron-metering-agent %files -n openstack-neutron-vpn-agent %doc LICENSE %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/vpn_agent.ini +%{_initrddir}/neutron-vpn-agent +%{_datadir}/neutron/neutron-vpn-agent.upstart %{_bindir}/neutron-vpn-agent %changelog +* Fri Oct 18 2013 Pádraig Brady - 2013.2-1 +- Update to havana GA + +* Thu Oct 10 2013 Terry Wilson - 2013.2-0.12.rc1 +- Update to havana rc1 + +* Wed Oct 2 2013 Terry Wilson - 2013.2-0.11.b3 +- Add python-jinja2 requires to VPN agent +- Ad missing services for VPN and metering agent + +* Thu Sep 26 2013 Terry Wilson - 2013.2-0.10.b3 +- Add support for neutron-dist.conf + +* Tue Sep 17 2013 Pádraig Brady - 2013.2-0.9.b3 +- Fix typo in openstack-neutron-meetering-agent package name +- Register all agent services with chkconfig during installation + * Mon Sep 09 2013 Terry Wilson - 2013.2-0.4.b3 - Update to havana milestone 3 release -- 2.32.3