Skip to content

Commit b05c876

Browse files
markmcclainmarkmcclain
committed
update for name change to Neutron
Note: Nova and Horizon are not updated until those projects have migrated. Change-Id: I256ef20e7caadd9c96e6dd908c5d8b69ca5c4aeb
1 parent 0a03806 commit b05c876

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+834
-827
lines changed

‎HACKING.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ follows:
110110
* Global service configuration like ``ENABLED_SERVICES``
111111
* Variables used by multiple services that do not have a clear owner, i.e.
112112
``VOLUME_BACKING_FILE_SIZE`` (nova-volumes and cinder) or ``PUBLIC_NETWORK_NAME``
113-
(nova-network and quantum)
113+
(nova-network and neutron)
114114
* Variables that can not be cleanly declared in a project file due to
115115
dependency ordering, i.e. the order of sourcing the project files can
116116
not be changed for other reasons but the earlier file needs to dereference a

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,25 +104,25 @@ If you are enabling `swift3` in `ENABLED_SERVICES` devstack will install the swi
104104

105105
Only Swift proxy server is launched in the screen session all other services are started in background and managed by `swift-init` tool.
106106

107-
# Quantum
107+
# Neutron
108108

109109
Basic Setup
110110

111-
In order to enable Quantum a single node setup, you'll need the following settings in your `localrc` :
111+
In order to enable Neutron a single node setup, you'll need the following settings in your `localrc` :
112112

113113
disable_service n-net
114114
enable_service q-svc
115115
enable_service q-agt
116116
enable_service q-dhcp
117117
enable_service q-l3
118118
enable_service q-meta
119-
enable_service quantum
119+
enable_service neutron
120120
# Optional, to enable tempest configuration as part of devstack
121121
enable_service tempest
122122

123123
Then run `stack.sh` as normal.
124124

125-
devstack supports adding specific Quantum configuration flags to both the Open vSwitch and LinuxBridge plugin configuration files. To make use of this feature, the following variables are defined and can be configured in your `localrc` file:
125+
devstack supports adding specific Neutron configuration flags to both the Open vSwitch and LinuxBridge plugin configuration files. To make use of this feature, the following variables are defined and can be configured in your `localrc` file:
126126

127127
Variable Name Plugin Config File Section Modified
128128
-------------------------------------------------------------------------------------
@@ -144,7 +144,7 @@ If tempest has been successfully configured, a basic set of smoke tests can be r
144144

145145
# Multi-Node Setup
146146

147-
A more interesting setup involves running multiple compute nodes, with Quantum networks connecting VMs on different compute nodes.
147+
A more interesting setup involves running multiple compute nodes, with Neutron networks connecting VMs on different compute nodes.
148148
You should run at least one "controller node", which should have a `stackrc` that includes at least:
149149

150150
disable_service n-net
@@ -153,15 +153,15 @@ You should run at least one "controller node", which should have a `stackrc` tha
153153
enable_service q-dhcp
154154
enable_service q-l3
155155
enable_service q-meta
156-
enable_service quantum
156+
enable_service neutron
157157

158158
You likely want to change your `localrc` to run a scheduler that will balance VMs across hosts:
159159

160160
SCHEDULER=nova.scheduler.simple.SimpleScheduler
161161

162162
You can then run many compute nodes, each of which should have a `stackrc` which includes the following, with the IP address of the above controller node:
163163

164-
ENABLED_SERVICES=n-cpu,rabbit,g-api,quantum,q-agt
164+
ENABLED_SERVICES=n-cpu,rabbit,g-api,neutron,q-agt
165165
SERVICE_HOST=[IP of controller node]
166166
MYSQL_HOST=$SERVICE_HOST
167167
RABBIT_HOST=$SERVICE_HOST

‎clean.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ source $TOP_DIR/lib/cinder
4242
source $TOP_DIR/lib/swift
4343
source $TOP_DIR/lib/ceilometer
4444
source $TOP_DIR/lib/heat
45-
source $TOP_DIR/lib/quantum
45+
source $TOP_DIR/lib/neutron
4646
source $TOP_DIR/lib/baremetal
4747
source $TOP_DIR/lib/ldap
4848

@@ -60,7 +60,7 @@ cleanup_cinder
6060
cleanup_glance
6161
cleanup_keystone
6262
cleanup_nova
63-
cleanup_quantum
63+
cleanup_neutron
6464
cleanup_swift
6565

6666
# cinder doesn't always clean up the volume group as it might be used elsewhere...

‎exercises/boot_from_volume.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ source $TOP_DIR/functions
3232
# Import configuration
3333
source $TOP_DIR/openrc
3434

35-
# Import quantum functions if needed
36-
if is_service_enabled quantum; then
37-
source $TOP_DIR/lib/quantum
35+
# Import neutron functions if needed
36+
if is_service_enabled neutron; then
37+
source $TOP_DIR/lib/neutron
3838
fi
3939

4040
# Import exercise configuration

‎exercises/euca.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ source $TOP_DIR/functions
3333
# Import EC2 configuration
3434
source $TOP_DIR/eucarc
3535

36-
# Import quantum functions if needed
37-
if is_service_enabled quantum; then
38-
source $TOP_DIR/lib/quantum
36+
# Import neutron functions if needed
37+
if is_service_enabled neutron; then
38+
source $TOP_DIR/lib/neutron
3939
fi
4040

4141
# Import exercise configuration

‎exercises/floating_ips.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ source $TOP_DIR/functions
3030
# Import configuration
3131
source $TOP_DIR/openrc
3232

33-
# Import quantum functions if needed
34-
if is_service_enabled quantum; then
35-
source $TOP_DIR/lib/quantum
33+
# Import neutron functions if needed
34+
if is_service_enabled neutron; then
35+
source $TOP_DIR/lib/neutron
3636
fi
3737

3838
# Import exercise configuration
@@ -155,7 +155,7 @@ nova add-floating-ip $VM_UUID $FLOATING_IP || \
155155
# Test we can ping our floating IP within ASSOCIATE_TIMEOUT seconds
156156
ping_check "$PUBLIC_NETWORK_NAME" $FLOATING_IP $ASSOCIATE_TIMEOUT
157157

158-
if ! is_service_enabled quantum; then
158+
if ! is_service_enabled neutron; then
159159
# Allocate an IP from second floating pool
160160
TEST_FLOATING_IP=$(nova floating-ip-create $TEST_FLOATING_POOL | grep $TEST_FLOATING_POOL | get_field 1)
161161
die_if_not_set $LINENO TEST_FLOATING_IP "Failure creating floating IP in $TEST_FLOATING_POOL"
@@ -179,7 +179,7 @@ fi
179179
# Clean up
180180
# --------
181181

182-
if ! is_service_enabled quantum; then
182+
if ! is_service_enabled neutron; then
183183
# Delete second floating IP
184184
nova floating-ip-delete $TEST_FLOATING_IP || \
185185
die $LINENO "Failure deleting floating IP $TEST_FLOATING_IP"

‎exercises/quantum-adv-test.sh‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env bash
22
#
33

4-
# **quantum-adv-test.sh**
4+
# **neutron-adv-test.sh**
55

6-
# Perform integration testing of Nova and other components with Quantum.
6+
# Perform integration testing of Nova and other components with Neutron.
77

88
echo "*********************************************************************"
99
echo "Begin DevStack Exercise: $0"
@@ -43,16 +43,16 @@ source $TOP_DIR/functions
4343
# Import configuration
4444
source $TOP_DIR/openrc
4545

46-
# Import quantum functions
47-
source $TOP_DIR/lib/quantum
46+
# Import neutron functions
47+
source $TOP_DIR/lib/neutron
4848

49-
# If quantum is not enabled we exit with exitcode 55, which means exercise is skipped.
50-
quantum_plugin_check_adv_test_requirements || exit 55
49+
# If neutron is not enabled we exit with exitcode 55, which means exercise is skipped.
50+
neutron_plugin_check_adv_test_requirements || exit 55
5151

5252
# Import exercise configuration
5353
source $TOP_DIR/exerciserc
5454

55-
# Quantum Settings
55+
# Neutron Settings
5656
# ----------------
5757

5858
TENANTS="DEMO1"
@@ -161,7 +161,7 @@ function get_role_id {
161161

162162
function get_network_id {
163163
local NETWORK_NAME="$1"
164-
local NETWORK_ID=`quantum net-list -F id -- --name=$NETWORK_NAME | awk "NR==4" | awk '{print $2}'`
164+
local NETWORK_ID=`neutron net-list -F id -- --name=$NETWORK_NAME | awk "NR==4" | awk '{print $2}'`
165165
echo $NETWORK_ID
166166
}
167167

@@ -232,9 +232,9 @@ function create_network {
232232
source $TOP_DIR/openrc admin admin
233233
local TENANT_ID=$(get_tenant_id $TENANT)
234234
source $TOP_DIR/openrc $TENANT $TENANT
235-
local NET_ID=$(quantum net-create --tenant_id $TENANT_ID $NET_NAME $EXTRA| grep ' id ' | awk '{print $4}' )
236-
quantum subnet-create --ip_version 4 --tenant_id $TENANT_ID --gateway $GATEWAY $NET_ID $CIDR
237-
quantum-debug probe-create --device-owner compute $NET_ID
235+
local NET_ID=$(neutron net-create --tenant_id $TENANT_ID $NET_NAME $EXTRA| grep ' id ' | awk '{print $4}' )
236+
neutron subnet-create --ip_version 4 --tenant_id $TENANT_ID --gateway $GATEWAY $NET_ID $CIDR
237+
neutron-debug probe-create --device-owner compute $NET_ID
238238
source $TOP_DIR/openrc demo demo
239239
}
240240

@@ -320,10 +320,10 @@ function delete_network {
320320
local TENANT_ID=$(get_tenant_id $TENANT)
321321
#TODO(nati) comment out until l3-agent merged
322322
#for res in port subnet net router;do
323-
for net_id in `quantum net-list -c id -c name | grep $NET_NAME | awk '{print $2}'`;do
323+
for net_id in `neutron net-list -c id -c name | grep $NET_NAME | awk '{print $2}'`;do
324324
delete_probe $net_id
325-
quantum subnet-list | grep $net_id | awk '{print $2}' | xargs -I% quantum subnet-delete %
326-
quantum net-delete $net_id
325+
neutron subnet-list | grep $net_id | awk '{print $2}' | xargs -I% neutron subnet-delete %
326+
neutron net-delete $net_id
327327
done
328328
source $TOP_DIR/openrc demo demo
329329
}

‎exercises/volumes.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ source $TOP_DIR/functions
3030
# Import configuration
3131
source $TOP_DIR/openrc
3232

33-
# Import quantum functions if needed
34-
if is_service_enabled quantum; then
35-
source $TOP_DIR/lib/quantum
33+
# Import neutron functions if needed
34+
if is_service_enabled neutron; then
35+
source $TOP_DIR/lib/neutron
3636
fi
3737

3838
# Import exercise configuration

‎functions‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ function get_packages() {
262262
file_to_parse="${file_to_parse} keystone"
263263
fi
264264
elif [[ $service == q-* ]]; then
265-
if [[ ! $file_to_parse =~ quantum ]]; then
266-
file_to_parse="${file_to_parse} quantum"
265+
if [[ ! $file_to_parse =~ neutron ]]; then
266+
file_to_parse="${file_to_parse} neutron"
267267
fi
268268
fi
269269
done
@@ -717,7 +717,7 @@ function is_running() {
717717
# **cinder** returns true if any service enabled start with **c-**
718718
# **ceilometer** returns true if any service enabled start with **ceilometer**
719719
# **glance** returns true if any service enabled start with **g-**
720-
# **quantum** returns true if any service enabled start with **q-**
720+
# **neutron** returns true if any service enabled start with **q-**
721721
# **swift** returns true if any service enabled start with **s-**
722722
# For backward compatibility if we have **swift** in ENABLED_SERVICES all the
723723
# **s-** services will be enabled. This will be deprecated in the future.
@@ -732,7 +732,7 @@ function is_service_enabled() {
732732
[[ ${service} == "cinder" && ${ENABLED_SERVICES} =~ "c-" ]] && return 0
733733
[[ ${service} == "ceilometer" && ${ENABLED_SERVICES} =~ "ceilometer-" ]] && return 0
734734
[[ ${service} == "glance" && ${ENABLED_SERVICES} =~ "g-" ]] && return 0
735-
[[ ${service} == "quantum" && ${ENABLED_SERVICES} =~ "q-" ]] && return 0
735+
[[ ${service} == "neutron" && ${ENABLED_SERVICES} =~ "q-" ]] && return 0
736736
[[ ${service} == "swift" && ${ENABLED_SERVICES} =~ "s-" ]] && return 0
737737
[[ ${service} == s-* && ${ENABLED_SERVICES} =~ "swift" ]] && return 0
738738
done
@@ -758,7 +758,7 @@ function _cleanup_service_list () {
758758
# enable_service qpid
759759
#
760760
# This function does not know about the special cases
761-
# for nova, glance, and quantum built into is_service_enabled().
761+
# for nova, glance, and neutron built into is_service_enabled().
762762
# Uses global ``ENABLED_SERVICES``
763763
# enable_service service [service ...]
764764
function enable_service() {
@@ -780,7 +780,7 @@ function enable_service() {
780780
# disable_service rabbit
781781
#
782782
# This function does not know about the special cases
783-
# for nova, glance, and quantum built into is_service_enabled().
783+
# for nova, glance, and neutron built into is_service_enabled().
784784
# Uses global ``ENABLED_SERVICES``
785785
# disable_service service [service ...]
786786
function disable_service() {
@@ -1330,8 +1330,8 @@ function zypper_install() {
13301330
# Uses globals ``ENABLED_SERVICES``
13311331
# ping_check from-net ip boot-timeout expected
13321332
function ping_check() {
1333-
if is_service_enabled quantum; then
1334-
_ping_check_quantum "$1" $2 $3 $4
1333+
if is_service_enabled neutron; then
1334+
_ping_check_neutron "$1" $2 $3 $4
13351335
return
13361336
fi
13371337
_ping_check_novanet "$1" $2 $3 $4
@@ -1370,8 +1370,8 @@ function _ping_check_novanet() {
13701370

13711371
# ssh_check net-name key-file floating-ip default-user active-timeout
13721372
function ssh_check() {
1373-
if is_service_enabled quantum; then
1374-
_ssh_check_quantum "$1" $2 $3 $4 $5
1373+
if is_service_enabled neutron; then
1374+
_ssh_check_neutron "$1" $2 $3 $4 $5
13751375
return
13761376
fi
13771377
_ssh_check_novanet "$1" $2 $3 $4 $5

‎lib/keystone‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ function configure_keystone() {
151151
echo "catalog.RegionOne.object_store.name = Swift Service" >> $KEYSTONE_CATALOG
152152
fi
153153

154-
# Add quantum endpoints to service catalog if quantum is enabled
155-
if is_service_enabled quantum; then
154+
# Add neutron endpoints to service catalog if neutron is enabled
155+
if is_service_enabled neutron; then
156156
echo "catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG
157157
echo "catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG
158158
echo "catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG
159-
echo "catalog.RegionOne.network.name = Quantum Service" >> $KEYSTONE_CATALOG
159+
echo "catalog.RegionOne.network.name = Neutron Service" >> $KEYSTONE_CATALOG
160160
fi
161161

162162
sed -e "

0 commit comments

Comments
 (0)