From 065b22b1b1c165c438144ab99aee872e31cc3c11 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 30 Jul 2013 14:49:55 +0800 Subject: [PATCH] More Quantum -> Neutron renames. Rewritten-From: 43aec7137427986d1404f41aeb15c6406446fef2 --- xenial/debian/cron.d/neutron-dhcp-agent-netns-cleanup | 2 +- xenial/debian/cron.d/neutron-l3-agent-netns-cleanup | 4 ++-- xenial/debian/cron.d/neutron-lbaas-agent-netns-cleanup | 3 ++- xenial/debian/neutron-l3-agent.upstart.in | 2 +- xenial/debian/neutron-lbaas-agent.upstart.in | 2 +- xenial/debian/neutron-plugin-linuxbridge-agent.upstart.in | 2 +- xenial/debian/neutron-plugin-nec-agent.upstart.in | 2 +- xenial/debian/neutron-plugin-openvswitch-agent.upstart.in | 2 +- xenial/debian/neutron-server.init | 4 ++-- xenial/debian/neutron-server.upstart.in | 2 +- 10 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xenial/debian/cron.d/neutron-dhcp-agent-netns-cleanup b/xenial/debian/cron.d/neutron-dhcp-agent-netns-cleanup index 8be4ff35d..54fdb9268 100644 --- a/xenial/debian/cron.d/neutron-dhcp-agent-netns-cleanup +++ b/xenial/debian/cron.d/neutron-dhcp-agent-netns-cleanup @@ -1,4 +1,4 @@ -# Periodically cleans Neutron's network namespaces on behalf of the Quantum +# Periodically cleans Neutron's network namespaces on behalf of the Neutron # DHCP agent. 30 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then \ /usr/bin/neutron-netns-cleanup \ diff --git a/xenial/debian/cron.d/neutron-l3-agent-netns-cleanup b/xenial/debian/cron.d/neutron-l3-agent-netns-cleanup index 56806a6cc..997a76d0f 100644 --- a/xenial/debian/cron.d/neutron-l3-agent-netns-cleanup +++ b/xenial/debian/cron.d/neutron-l3-agent-netns-cleanup @@ -1,5 +1,5 @@ -# Periodically cleans Quantum's network namespaces on behalf of the Quantum -# L3 agent. +# Periodically cleans Neutron's network namespaces on behalf of the Neutron L3 agent. + 0 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then \ /usr/bin/neutron-netns-cleanup \ --config-file=/etc/neutron/neutron.conf \ diff --git a/xenial/debian/cron.d/neutron-lbaas-agent-netns-cleanup b/xenial/debian/cron.d/neutron-lbaas-agent-netns-cleanup index b93dd4b35..fa4c455eb 100644 --- a/xenial/debian/cron.d/neutron-lbaas-agent-netns-cleanup +++ b/xenial/debian/cron.d/neutron-lbaas-agent-netns-cleanup @@ -1,4 +1,5 @@ -# Periodically cleans Quantum's network namespaces on behalf of the Quantum LBaaS agent. +# Periodically cleans Neutron's network namespaces on behalf of the Neutron LBaaS agent. + 0 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then \ /usr/bin/neutron-netns-cleanup \ --config-file=/etc/neutron/neutron.conf \ diff --git a/xenial/debian/neutron-l3-agent.upstart.in b/xenial/debian/neutron-l3-agent.upstart.in index 780e6b645..9e10945f4 100644 --- a/xenial/debian/neutron-l3-agent.upstart.in +++ b/xenial/debian/neutron-l3-agent.upstart.in @@ -1,4 +1,4 @@ -description "Quantum l3 plugin agent" +description "Neutron l3 plugin agent" author "Chuck Short " start on runlevel [2345] diff --git a/xenial/debian/neutron-lbaas-agent.upstart.in b/xenial/debian/neutron-lbaas-agent.upstart.in index feed3e4f6..21ee48f00 100644 --- a/xenial/debian/neutron-lbaas-agent.upstart.in +++ b/xenial/debian/neutron-lbaas-agent.upstart.in @@ -1,4 +1,4 @@ -description "Quantum LBaaS agent" +description "Neutron LBaaS agent" author "Chuck Short " start on runlevel [2345] diff --git a/xenial/debian/neutron-plugin-linuxbridge-agent.upstart.in b/xenial/debian/neutron-plugin-linuxbridge-agent.upstart.in index 1f0b67fae..44e2eadc4 100644 --- a/xenial/debian/neutron-plugin-linuxbridge-agent.upstart.in +++ b/xenial/debian/neutron-plugin-linuxbridge-agent.upstart.in @@ -1,4 +1,4 @@ -description "Quantum server" +description "Neutron server" author "Chuck Short " start on runlevel [2345] diff --git a/xenial/debian/neutron-plugin-nec-agent.upstart.in b/xenial/debian/neutron-plugin-nec-agent.upstart.in index c7ba3ea1b..2ec450fe5 100644 --- a/xenial/debian/neutron-plugin-nec-agent.upstart.in +++ b/xenial/debian/neutron-plugin-nec-agent.upstart.in @@ -1,4 +1,4 @@ -description "Quantum plugin NEC agent" +description "Neutron plugin NEC agent" author "Chuck Short " start on runlevel [2345] diff --git a/xenial/debian/neutron-plugin-openvswitch-agent.upstart.in b/xenial/debian/neutron-plugin-openvswitch-agent.upstart.in index ff741afc1..157179289 100644 --- a/xenial/debian/neutron-plugin-openvswitch-agent.upstart.in +++ b/xenial/debian/neutron-plugin-openvswitch-agent.upstart.in @@ -1,4 +1,4 @@ -description "Quantum openvswitch plugin agent" +description "Neutron openvswitch plugin agent" author "Chuck Short " start on runlevel [2345] diff --git a/xenial/debian/neutron-server.init b/xenial/debian/neutron-server.init index 447621438..23b7cb273 100644 --- a/xenial/debian/neutron-server.init +++ b/xenial/debian/neutron-server.init @@ -28,8 +28,8 @@ DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --log-file=$LOGFILE" if [ -r /etc/default/neutron-server ] ; then . /etc/default/neutron-server - if [ -n "${QUANTUM_PLUGIN_CONFIG}" ] ; then - DAEMON_ARGS="${DAEMON_ARGS} --config-file=${QUANTUM_PLUGIN_CONFIG}" + if [ -n "${NEUTRON_PLUGIN_CONFIG}" ] ; then + DAEMON_ARGS="${DAEMON_ARGS} --config-file=${NEUTRON_PLUGIN_CONFIG}" fi fi diff --git a/xenial/debian/neutron-server.upstart.in b/xenial/debian/neutron-server.upstart.in index ba86aec91..4d1f54314 100644 --- a/xenial/debian/neutron-server.upstart.in +++ b/xenial/debian/neutron-server.upstart.in @@ -13,7 +13,7 @@ end script script [ -r /etc/default/neutron-server ] && . /etc/default/neutron-server - [ -r "$QUANTUM_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $QUANTUM_PLUGIN_CONFIG" + [ -r "$NEUTRON_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $NEUTRON_PLUGIN_CONFIG" exec start-stop-daemon --start --chuid neutron:neutron --exec /usr/bin/neutron-server -- \ --config-file /etc/neutron/neutron.conf \ --log-file /var/log/neutron/server.log $CONF_ARG -- 2.45.2