Rename Quantum to Neutron

This change renames everything to Neutron while providing backwards compatible adjustments for Grizzly configuration files. implements blueprint: remove-use-of-quantum Change-Id: Ie7d07ba7c89857e13d4ddc8f0e9b68de020a3d19
2013-07-03 19:39:46 -04:00 · 2013-07-03 19:39:46 -04:00 · e248aebca4
parent ef7467e2ab
commit e248aebca4
1 changed files with 76 additions and 56 deletions
--- a/setup.cfg
+++ b/setup.cfg
@ -1,5 +1,5 @@
 [metadata]
-name = quantum
+name = neutron
 version = 2013.2
 summary = OpenStack Networking
 description-file =
@ -20,73 +20,93 @@ classifier =

 [files]
 packages =
+    neutron
    quantum
 data_files =
-    etc/quantum =
+    etc/neutron =
        etc/api-paste.ini
        etc/dhcp_agent.ini
        etc/l3_agent.ini
        etc/lbaas_agent.ini
        etc/metadata_agent.ini
        etc/policy.json
-        etc/quantum.conf
+        etc/neutron.conf
        etc/rootwrap.conf
-    etc/quantum/rootwrap.d =
-        etc/quantum/rootwrap.d/dhcp.filters
-        etc/quantum/rootwrap.d/iptables-firewall.filters
-        etc/quantum/rootwrap.d/l3.filters
-        etc/quantum/rootwrap.d/lbaas-haproxy.filters
-        etc/quantum/rootwrap.d/linuxbridge-plugin.filters
-        etc/quantum/rootwrap.d/nec-plugin.filters
-        etc/quantum/rootwrap.d/openvswitch-plugin.filters
-        etc/quantum/rootwrap.d/ryu-plugin.filters
-    etc/init.d = etc/init.d/quantum-server
-    etc/quantum/plugins/bigswitch = etc/quantum/plugins/bigswitch/restproxy.ini
-    etc/quantum/plugins/brocade = etc/quantum/plugins/brocade/brocade.ini
-    etc/quantum/plugins/cisco = etc/quantum/plugins/cisco/cisco_plugins.ini
-    etc/quantum/plugins/hyperv = etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini
-    etc/quantum/plugins/linuxbridge = etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
-    etc/quantum/plugins/metaplugin = etc/quantum/plugins/metaplugin/metaplugin.ini
-    etc/quantum/plugins/midonet = etc/quantum/plugins/midonet/midonet.ini
-    etc/quantum/plugins/ml2 = etc/quantum/plugins/ml2/ml2_conf.ini
-    etc/quantum/plugins/mlnx = etc/quantum/plugins/mlnx/mlnx_conf.ini
-    etc/quantum/plugins/nec = etc/quantum/plugins/nec/nec.ini
-    etc/quantum/plugins/nicira = etc/quantum/plugins/nicira/nvp.ini
-    etc/quantum/plugins/openvswitch = etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
-    etc/quantum/plugins/plumgrid = etc/quantum/plugins/plumgrid/plumgrid.ini
-    etc/quantum/plugins/ryu = etc/quantum/plugins/ryu/ryu.ini
+    etc/neutron/rootwrap.d =
+        etc/neutron/rootwrap.d/dhcp.filters
+        etc/neutron/rootwrap.d/iptables-firewall.filters
+        etc/neutron/rootwrap.d/l3.filters
+        etc/neutron/rootwrap.d/lbaas-haproxy.filters
+        etc/neutron/rootwrap.d/linuxbridge-plugin.filters
+        etc/neutron/rootwrap.d/nec-plugin.filters
+        etc/neutron/rootwrap.d/openvswitch-plugin.filters
+        etc/neutron/rootwrap.d/ryu-plugin.filters
+    etc/init.d = etc/init.d/neutron-server
+    etc/neutron/plugins/bigswitch = etc/neutron/plugins/bigswitch/restproxy.ini
+    etc/neutron/plugins/brocade = etc/neutron/plugins/brocade/brocade.ini
+    etc/neutron/plugins/cisco = etc/neutron/plugins/cisco/cisco_plugins.ini
+    etc/neutron/plugins/hyperv = etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini
+    etc/neutron/plugins/linuxbridge = etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
+    etc/neutron/plugins/metaplugin = etc/neutron/plugins/metaplugin/metaplugin.ini
+    etc/neutron/plugins/midonet = etc/neutron/plugins/midonet/midonet.ini
+    etc/neutron/plugins/ml2 = etc/neutron/plugins/ml2/ml2_conf.ini
+    etc/neutron/plugins/mlnx = etc/neutron/plugins/mlnx/mlnx_conf.ini
+    etc/neutron/plugins/nec = etc/neutron/plugins/nec/nec.ini
+    etc/neutron/plugins/nicira = etc/neutron/plugins/nicira/nvp.ini
+    etc/neutron/plugins/openvswitch = etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+    etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini
+    etc/neutron/plugins/ryu = etc/neutron/plugins/ryu/ryu.ini
 scripts =
    bin/quantum-rootwrap
+    bin/neutron-rootwrap

 [global]
 setup-hooks =
    pbr.hooks.setup_hook
-    quantum.hooks.setup_hook
+    neutron.hooks.setup_hook

 [entry_points]
 console_scripts =
-    quantum-check-nvp-config = quantum.plugins.nicira.check_nvp_config:main
-    quantum-db-manage = quantum.db.migration.cli:main
-    quantum-debug = quantum.debug.shell:main
-    quantum-dhcp-agent = quantum.agent.dhcp_agent:main
-    quantum-dhcp-agent-dnsmasq-lease-update = quantum.agent.linux.dhcp:Dnsmasq.lease_update
-    quantum-hyperv-agent = quantum.plugins.hyperv.agent.hyperv_quantum_agent:main
-    quantum-l3-agent = quantum.agent.l3_agent:main
-    quantum-lbaas-agent = quantum.services.loadbalancer.drivers.haproxy.agent:main
-    quantum-linuxbridge-agent = quantum.plugins.linuxbridge.agent.linuxbridge_quantum_agent:main
-    quantum-metadata-agent = quantum.agent.metadata.agent:main
-    quantum-mlnx-agent = quantum.plugins.mlnx.agent.eswitch_quantum_agent:main
-    quantum-nec-agent = quantum.plugins.nec.agent.nec_quantum_agent:main
-    quantum-netns-cleanup = quantum.agent.netns_cleanup_util:main
-    quantum-ns-metadata-proxy = quantum.agent.metadata.namespace_proxy:main
-    quantum-openvswitch-agent = quantum.plugins.openvswitch.agent.ovs_quantum_agent:main
-    quantum-ovs-cleanup = quantum.agent.ovs_cleanup_util:main
-    quantum-ryu-agent = quantum.plugins.ryu.agent.ryu_quantum_agent:main
-    quantum-server = quantum.server:main
-quantum.ml2.type_drivers =
-    flat = quantum.plugins.ml2.drivers.type_flat:FlatTypeDriver
-    local = quantum.plugins.ml2.drivers.type_local:LocalTypeDriver
-    vlan = quantum.plugins.ml2.drivers.type_vlan:VlanTypeDriver
+    neutron-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main
+    neutron-db-manage = neutron.db.migration.cli:main
+    neutron-debug = neutron.debug.shell:main
+    neutron-dhcp-agent = neutron.agent.dhcp_agent:main
+    neutron-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update
+    neutron-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main
+    neutron-l3-agent = neutron.agent.l3_agent:main
+    neutron-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main
+    neutron-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
+    neutron-metadata-agent = neutron.agent.metadata.agent:main
+    neutron-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
+    neutron-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main
+    neutron-netns-cleanup = neutron.agent.netns_cleanup_util:main
+    neutron-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main
+    neutron-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main
+    neutron-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
+    neutron-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
+    neutron-server = neutron.server:main
+    quantum-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main
+    quantum-db-manage = neutron.db.migration.cli:main
+    quantum-debug = neutron.debug.shell:main
+    quantum-dhcp-agent = neutron.agent.dhcp_agent:main
+    quantum-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update
+    quantum-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main
+    quantum-l3-agent = neutron.agent.l3_agent:main
+    quantum-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main
+    quantum-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
+    quantum-metadata-agent = neutron.agent.metadata.agent:main
+    quantum-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
+    quantum-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main
+    quantum-netns-cleanup = neutron.agent.netns_cleanup_util:main
+    quantum-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main
+    quantum-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main
+    quantum-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
+    quantum-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
+    quantum-server = neutron.server:main
+neutron.ml2.type_drivers =
+    flat = neutron.plugins.ml2.drivers.type_flat:FlatTypeDriver
+    local = neutron.plugins.ml2.drivers.type_local:LocalTypeDriver
+    vlan = neutron.plugins.ml2.drivers.type_vlan:VlanTypeDriver

 [build_sphinx]
 all_files = 1
@ -96,13 +116,13 @@ source-dir = doc/source
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = quantum/locale/quantum.pot
+output_file = neutron/locale/neutron.pot

 [compile_catalog]
-directory = quantum/locale
-domain = quantum
+directory = neutron/locale
+domain = neutron

 [update_catalog]
-domain = quantum
-output_dir = quantum/locale
-input_file = quantum/locale/quantum.pot
+domain = neutron
+output_dir = neutron/locale
+input_file = neutron/locale/neutron.pot