Rename quantum to neutron

See https://wiki.openstack.org/wiki/Network/neutron-renaming

Change-Id: I2477a5f47842e5e497ffd8bf6a10b55f89895ae9
This commit is contained in:
James E. Blair 2013-07-05 11:55:32 -07:00
parent 8dc40ed396
commit 6b1c66208e
4 changed files with 10 additions and 10 deletions

View File

@ -22,16 +22,16 @@ change to the following projects must pass the devstack gate test::
keystone
heat
horizon
quantum
neutron
ceilometer
python-novaclient
python-heatclient
python-keystoneclient
python-quantumclient
python-neutronclient
devstack
devstack-gate
Obviously we test nova, glance, keystone, horizon, quantum and their clients
Obviously we test nova, glance, keystone, horizon, neutron and their clients
because they all work closely together to form an OpenStack
system. Changes to devstack itself are also required to pass this test
so that we can be assured that devstack is always able to produce a

View File

@ -291,7 +291,7 @@ function cleanup_host {
set +o xtrace
}
PROJECTS="openstack-dev/devstack openstack-dev/grenade openstack-dev/pbr openstack/requirements openstack/nova openstack/glance openstack/heat openstack/keystone openstack/python-novaclient openstack/python-heatclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/quantum openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient openstack/ceilometer openstack/python-ceilometerclient ${PROJECTS}"
PROJECTS="openstack-dev/devstack openstack-dev/grenade openstack-dev/pbr openstack/requirements openstack/nova openstack/glance openstack/heat openstack/keystone openstack/python-novaclient openstack/python-heatclient openstack/python-keystoneclient openstack/python-neutronclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/neutron openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient openstack/ceilometer openstack/python-ceilometerclient ${PROJECTS}"
# Set this variable to skip updating the devstack-gate project itself.
# Useful in development so you can edit scripts in place and run them
@ -348,9 +348,9 @@ export DEVSTACK_GATE_CINDER=${DEVSTACK_GATE_CINDER:-0}
# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1023755
export DEVSTACK_CINDER_SECURE_DELETE=${DEVSTACK_CINDER_SECURE_DELETE:-0}
# Set to 1 to run quantum instead of nova network
# Set to 1 to run neutron instead of nova network
# Only applicable to master branch
export DEVSTACK_GATE_QUANTUM=${DEVSTACK_GATE_QUANTUM:-0}
export DEVSTACK_GATE_NEUTRON=${DEVSTACK_GATE_NEUTRON:-0}
# Set to 1 to run nova in cells mode instead of the default mode
export DEVSTACK_GATE_CELLS=${DEVSTACK_GATE_CELLS:-0}

View File

@ -55,7 +55,7 @@ function setup_localrc() {
fi
elif [ "$LOCALRC_BRANCH" == "stable/grizzly" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond
if [ "$DEVSTACK_GATE_QUANTUM" -eq "1" ]; then
if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta
echo "Q_USE_DEBUG_COMMAND=True" >>localrc
echo "NETWORK_GATEWAY=10.1.0.1" >>localrc
@ -67,7 +67,7 @@ function setup_localrc() {
fi
else # master
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api
if [ "$DEVSTACK_GATE_QUANTUM" -eq "1" ]; then
if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta
echo "Q_USE_DEBUG_COMMAND=True" >>localrc
echo "NETWORK_GATEWAY=10.1.0.1" >>localrc

View File

@ -55,14 +55,14 @@ PROJECTS = ['openstack/nova',
'openstack/ceilometer',
'openstack/swift',
'openstack/tempest',
'openstack/quantum',
'openstack/neutron',
'openstack/python-ceilometerclient',
'openstack/python-glanceclient',
'openstack/python-keystoneclient',
'openstack/python-heatclient',
'openstack/python-novaclient',
'openstack/python-openstackclient',
'openstack/python-quantumclient',
'openstack/python-neutronclient',
'openstack-dev/devstack',
'openstack-dev/grenade',
'openstack-dev/pbr',