More Quantum -> Neutron renames.

Rewritten-From: 43aec7137427986d1404f41aeb15c6406446fef2

diff --git a/trusty/debian/cron.d/neutron-dhcp-agent-netns-cleanup b/trusty/debian/cron.d/neutron-dhcp-agent-netns-cleanup
index 8be4ff35dc313aef49548249634e016b81f5add0..54fdb92683afc58eea0f62cff8df164fc2717d47 100644 (file)
--- a/trusty/debian/cron.d/neutron-dhcp-agent-netns-cleanup
+++ b/trusty/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/trusty/debian/cron.d/neutron-l3-agent-netns-cleanup b/trusty/debian/cron.d/neutron-l3-agent-netns-cleanup
index 56806a6cc4b7711db5a433e4b1c0f4484ae8b33c..997a76d0f84302217653bbff04f540450e2b60c0 100644 (file)
--- a/trusty/debian/cron.d/neutron-l3-agent-netns-cleanup
+++ b/trusty/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/trusty/debian/cron.d/neutron-lbaas-agent-netns-cleanup b/trusty/debian/cron.d/neutron-lbaas-agent-netns-cleanup
index b93dd4b35951ebbb617aca4e24965bdf95abe491..fa4c455eb9332991f31a295109f17207b9277216 100644 (file)
--- a/trusty/debian/cron.d/neutron-lbaas-agent-netns-cleanup
+++ b/trusty/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/trusty/debian/neutron-l3-agent.upstart.in b/trusty/debian/neutron-l3-agent.upstart.in
index 780e6b64598ae8c88f9c97ea54884bb5bc1c1983..9e10945f43f2260c4d7f005d7d7bc9e4ed4965ea 100644 (file)
--- a/trusty/debian/neutron-l3-agent.upstart.in
+++ b/trusty/debian/neutron-l3-agent.upstart.in
@@ -1,4 +1,4 @@
-description "Quantum l3 plugin agent"
+description "Neutron l3 plugin agent"
 author "Chuck Short <zulcss@ubuntu.com>"
 
 start on runlevel [2345]

diff --git a/trusty/debian/neutron-lbaas-agent.upstart.in b/trusty/debian/neutron-lbaas-agent.upstart.in
index feed3e4f6077ad58afd8e74a48537497f0321e0a..21ee48f000da3b7aa01f3ae4afe779bd8e239ad3 100644 (file)
--- a/trusty/debian/neutron-lbaas-agent.upstart.in
+++ b/trusty/debian/neutron-lbaas-agent.upstart.in
@@ -1,4 +1,4 @@
-description "Quantum LBaaS agent"
+description "Neutron LBaaS agent"
 author "Chuck Short <zulcss@ubuntu.com>"
 
 start on runlevel [2345]

diff --git a/trusty/debian/neutron-plugin-linuxbridge-agent.upstart.in b/trusty/debian/neutron-plugin-linuxbridge-agent.upstart.in
index 1f0b67faee9dd100f99cbb3b0497d94f42458281..44e2eadc4368963b35d214f95d3fbb8ba5046fdf 100644 (file)
--- a/trusty/debian/neutron-plugin-linuxbridge-agent.upstart.in
+++ b/trusty/debian/neutron-plugin-linuxbridge-agent.upstart.in
@@ -1,4 +1,4 @@
-description "Quantum server"
+description "Neutron server"
 author "Chuck Short <zulcss@ubuntu.com>"
 
 start on runlevel [2345]

diff --git a/trusty/debian/neutron-plugin-nec-agent.upstart.in b/trusty/debian/neutron-plugin-nec-agent.upstart.in
index c7ba3ea1b0342bfe6bb8e0ad50e1ce396d60bc7b..2ec450fe58b38e229de9c34aad39837a9be55238 100644 (file)
--- a/trusty/debian/neutron-plugin-nec-agent.upstart.in
+++ b/trusty/debian/neutron-plugin-nec-agent.upstart.in
@@ -1,4 +1,4 @@
-description "Quantum plugin NEC agent"
+description "Neutron plugin NEC agent"
 author "Chuck Short <zulcss@ubuntu.com>"
 
 start on runlevel [2345]

diff --git a/trusty/debian/neutron-plugin-openvswitch-agent.upstart.in b/trusty/debian/neutron-plugin-openvswitch-agent.upstart.in
index ff741afc13481f9e6939aa4c40fd2ed910b3653c..157179289229e84e7b4271dce7591322688ab948 100644 (file)
--- a/trusty/debian/neutron-plugin-openvswitch-agent.upstart.in
+++ b/trusty/debian/neutron-plugin-openvswitch-agent.upstart.in
@@ -1,4 +1,4 @@
-description "Quantum openvswitch plugin agent"
+description "Neutron openvswitch plugin agent"
 author "Chuck Short <zulcss@ubuntu.com>"
 
 start on runlevel [2345]

diff --git a/trusty/debian/neutron-server.init b/trusty/debian/neutron-server.init
index 447621438d7c463705a86dd1ca316bccf24c1276..23b7cb273a437db9eec5d2c721640defa3302297 100644 (file)
--- a/trusty/debian/neutron-server.init
+++ b/trusty/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/trusty/debian/neutron-server.upstart.in b/trusty/debian/neutron-server.upstart.in
index ba86aec91aae185faae026554e738222175f4479..4d1f54314ceb4b2e54751a279e88a48c72bbd3a8 100644 (file)
--- a/trusty/debian/neutron-server.upstart.in
+++ b/trusty/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