... | ... |
@@ -407,7 +407,6 @@ |
407 | 407 |
# Nova services |
408 | 408 |
n-api: true |
409 | 409 |
n-api-meta: true |
410 |
- n-cauth: true |
|
411 | 410 |
n-cond: true |
412 | 411 |
n-cpu: true |
413 | 412 |
n-novnc: true |
... | ... |
@@ -688,11 +687,8 @@ |
688 | 688 |
# being experimental any more, so we can keep this list somewhat |
689 | 689 |
# pruned. |
690 | 690 |
# |
691 |
- # * nova-cells-v1: maintained by nova for cells v1 (nova-cells service); |
|
692 |
- # it's in experimental here (and in nova) for testing cells v1 |
|
693 |
- # changes to devstack w/o gating on it for all devstack changes. |
|
694 | 691 |
# * nova-next: maintained by nova for unreleased/undefaulted |
695 |
- # things like cellsv2 and placement-api |
|
692 |
+ # things |
|
696 | 693 |
# * neutron-fullstack-with-uwsgi: maintained by neutron for fullstack test |
697 | 694 |
# when neutron-api is served by uwsgi, it's in exprimental for testing. |
698 | 695 |
# the next cycle we can remove this job if things turn out to be |
... | ... |
@@ -705,10 +701,6 @@ |
705 | 705 |
|
706 | 706 |
experimental: |
707 | 707 |
jobs: |
708 |
- - nova-cells-v1: |
|
709 |
- irrelevant-files: |
|
710 |
- - ^.*\.rst$ |
|
711 |
- - ^doc/.*$ |
|
712 | 708 |
- nova-next |
713 | 709 |
- neutron-fullstack-with-uwsgi |
714 | 710 |
- neutron-functional-with-uwsgi |
... | ... |
@@ -145,8 +145,8 @@ follows: |
145 | 145 |
* Global configuration that may be referenced in ``local.conf``, i.e. ``DEST``, ``DATA_DIR`` |
146 | 146 |
* Global service configuration like ``ENABLED_SERVICES`` |
147 | 147 |
* Variables used by multiple services that do not have a clear owner, i.e. |
148 |
- ``VOLUME_BACKING_FILE_SIZE`` (nova-compute, nova-volumes and cinder) or |
|
149 |
- ``PUBLIC_NETWORK_NAME`` (nova-network and neutron) |
|
148 |
+ ``VOLUME_BACKING_FILE_SIZE`` (nova-compute and cinder) or |
|
149 |
+ ``PUBLIC_NETWORK_NAME`` (only neutron but formerly nova-network too) |
|
150 | 150 |
* Variables that can not be cleanly declared in a project file due to |
151 | 151 |
dependency ordering, i.e. the order of sourcing the project files can |
152 | 152 |
not be changed for other reasons but the earlier file needs to dereference a |
... | ... |
@@ -663,20 +663,6 @@ Xenserver |
663 | 663 |
If you would like to use Xenserver as the hypervisor, please refer to |
664 | 664 |
the instructions in ``./tools/xen/README.md``. |
665 | 665 |
|
666 |
-Cells |
|
667 |
-~~~~~ |
|
668 |
- |
|
669 |
-`Cells <https://wiki.openstack.org/wiki/Blueprint-nova-compute-cells>`__ is |
|
670 |
-an alternative scaling option. To setup a cells environment add the |
|
671 |
-following to your ``localrc`` section: |
|
672 |
- |
|
673 |
-:: |
|
674 |
- |
|
675 |
- enable_service n-cell |
|
676 |
- |
|
677 |
-Be aware that there are some features currently missing in cells, one |
|
678 |
-notable one being security groups. |
|
679 |
- |
|
680 | 666 |
Cinder |
681 | 667 |
~~~~~~ |
682 | 668 |
|
... | ... |
@@ -120,11 +120,8 @@ cluster controller's DevStack in ``local.conf``: |
120 | 120 |
|
121 | 121 |
[[local|localrc]] |
122 | 122 |
HOST_IP=192.168.42.11 |
123 |
- FLAT_INTERFACE=eth0 |
|
124 | 123 |
FIXED_RANGE=10.4.128.0/20 |
125 |
- FIXED_NETWORK_SIZE=4096 |
|
126 | 124 |
FLOATING_RANGE=192.168.42.128/25 |
127 |
- MULTI_HOST=1 |
|
128 | 125 |
LOGFILE=/opt/stack/logs/stack.sh.log |
129 | 126 |
ADMIN_PASSWORD=labstack |
130 | 127 |
DATABASE_PASSWORD=supersecret |
... | ... |
@@ -160,11 +157,8 @@ machines, create a ``local.conf`` with: |
160 | 160 |
|
161 | 161 |
[[local|localrc]] |
162 | 162 |
HOST_IP=192.168.42.12 # change this per compute node |
163 |
- FLAT_INTERFACE=eth0 |
|
164 | 163 |
FIXED_RANGE=10.4.128.0/20 |
165 |
- FIXED_NETWORK_SIZE=4096 |
|
166 | 164 |
FLOATING_RANGE=192.168.42.128/25 |
167 |
- MULTI_HOST=1 |
|
168 | 165 |
LOGFILE=/opt/stack/logs/stack.sh.log |
169 | 166 |
ADMIN_PASSWORD=labstack |
170 | 167 |
DATABASE_PASSWORD=supersecret |
... | ... |
@@ -87,11 +87,8 @@ do the following: |
87 | 87 |
- Set ``FLOATING_RANGE`` to a range not used on the local network, i.e. |
88 | 88 |
192.168.1.224/27. This configures IP addresses ending in 225-254 to |
89 | 89 |
be used as floating IPs. |
90 |
-- Set ``FIXED_RANGE`` and ``FIXED_NETWORK_SIZE`` to configure the |
|
91 |
- internal address space used by the instances. |
|
92 |
-- Set ``FLAT_INTERFACE`` to the Ethernet interface that connects the |
|
93 |
- host to your local network. This is the interface that should be |
|
94 |
- configured with the static IP address mentioned above. |
|
90 |
+- Set ``FIXED_RANGE`` to configure the internal address space used by the |
|
91 |
+ instances. |
|
95 | 92 |
- Set the administrative password. This password is used for the |
96 | 93 |
**admin** and **demo** accounts set up as OpenStack users. |
97 | 94 |
- Set the MySQL administrative password. The default here is a random |
... | ... |
@@ -108,8 +105,6 @@ do the following: |
108 | 108 |
[[local|localrc]] |
109 | 109 |
FLOATING_RANGE=192.168.1.224/27 |
110 | 110 |
FIXED_RANGE=10.11.12.0/24 |
111 |
- FIXED_NETWORK_SIZE=256 |
|
112 |
- FLAT_INTERFACE=eth0 |
|
113 | 111 |
ADMIN_PASSWORD=supersecret |
114 | 112 |
DATABASE_PASSWORD=iheartdatabases |
115 | 113 |
RABBIT_PASSWORD=flopsymopsy |
... | ... |
@@ -469,7 +469,7 @@ EOF |
469 | 469 |
|
470 | 470 |
|
471 | 471 |
# ping check |
472 |
-# Uses globals ``ENABLED_SERVICES``, ``TOP_DIR``, ``MULTI_HOST``, ``PRIVATE_NETWORK`` |
|
472 |
+# Uses globals ``ENABLED_SERVICES``, ``TOP_DIR``, ``PRIVATE_NETWORK`` |
|
473 | 473 |
# ping_check <ip> [boot-timeout] [from_net] [expected] |
474 | 474 |
function ping_check { |
475 | 475 |
local ip=$1 |
... | ... |
@@ -483,12 +483,9 @@ function ping_check { |
483 | 483 |
# if we don't specify a from_net we're expecting things to work |
484 | 484 |
# fine from our local box. |
485 | 485 |
if [[ -n "$from_net" ]]; then |
486 |
+ # TODO(stephenfin): Is there any way neutron could be disabled now? |
|
486 | 487 |
if is_service_enabled neutron; then |
487 | 488 |
ping_cmd="$TOP_DIR/tools/ping_neutron.sh $from_net" |
488 |
- elif [[ "$MULTI_HOST" = "True" && "$from_net" = "$PRIVATE_NETWORK_NAME" ]]; then |
|
489 |
- # there is no way to address the multihost / private case, bail here for compatibility. |
|
490 |
- # TODO: remove this cruft and redo code to handle this at the caller level. |
|
491 |
- return |
|
492 | 489 |
fi |
493 | 490 |
fi |
494 | 491 |
|
... | ... |
@@ -1929,10 +1929,6 @@ function enable_service { |
1929 | 1929 |
# For backward compatibility if we have **swift** in ENABLED_SERVICES all the |
1930 | 1930 |
# **s-** services will be enabled. This will be deprecated in the future. |
1931 | 1931 |
# |
1932 |
-# Cells within nova is enabled if **n-cell** is in ``ENABLED_SERVICES``. |
|
1933 |
-# We also need to make sure to treat **n-cell-region** and **n-cell-child** |
|
1934 |
-# as enabled in this case. |
|
1935 |
-# |
|
1936 | 1932 |
# Uses global ``ENABLED_SERVICES`` |
1937 | 1933 |
# is_service_enabled service [service ...] |
1938 | 1934 |
function is_service_enabled { |
... | ... |
@@ -1955,7 +1951,6 @@ function is_service_enabled { |
1955 | 1955 |
# TODO(dtroyer): Remove these legacy special-cases after the is_XXX_enabled() |
1956 | 1956 |
# are implemented |
1957 | 1957 |
|
1958 |
- [[ ${service} == n-cell-* && ,${ENABLED_SERVICES} =~ ,"n-cell" ]] && enabled=0 |
|
1959 | 1958 |
[[ ${service} == n-cpu-* && ,${ENABLED_SERVICES} =~ ,"n-cpu" ]] && enabled=0 |
1960 | 1959 |
[[ ${service} == "nova" && ,${ENABLED_SERVICES} =~ ,"n-" ]] && enabled=0 |
1961 | 1960 |
[[ ${service} == "glance" && ,${ENABLED_SERVICES} =~ ,"g-" ]] && enabled=0 |
... | ... |
@@ -50,8 +50,6 @@ |
50 | 50 |
# See "Neutron Network Configuration" below for additional variables |
51 | 51 |
# that must be set in localrc for connectivity across hosts with |
52 | 52 |
# Neutron. |
53 |
-# |
|
54 |
-# With Neutron networking the NETWORK_MANAGER variable is ignored. |
|
55 | 53 |
|
56 | 54 |
# Settings |
57 | 55 |
# -------- |
... | ... |
@@ -50,11 +50,9 @@ NOVA_AUTH_CACHE_DIR=${NOVA_AUTH_CACHE_DIR:-/var/cache/nova} |
50 | 50 |
|
51 | 51 |
NOVA_CONF_DIR=/etc/nova |
52 | 52 |
NOVA_CONF=$NOVA_CONF_DIR/nova.conf |
53 |
-NOVA_CELLS_CONF=$NOVA_CONF_DIR/nova-cells.conf |
|
54 | 53 |
NOVA_COND_CONF=$NOVA_CONF_DIR/nova.conf |
55 | 54 |
NOVA_CPU_CONF=$NOVA_CONF_DIR/nova-cpu.conf |
56 | 55 |
NOVA_FAKE_CONF=$NOVA_CONF_DIR/nova-fake.conf |
57 |
-NOVA_CELLS_DB=${NOVA_CELLS_DB:-nova_cell} |
|
58 | 56 |
NOVA_API_DB=${NOVA_API_DB:-nova_api} |
59 | 57 |
NOVA_UWSGI=$NOVA_BIN_DIR/nova-api-wsgi |
60 | 58 |
NOVA_METADATA_UWSGI=$NOVA_BIN_DIR/nova-metadata-wsgi |
... | ... |
@@ -111,7 +109,6 @@ QEMU_CONF=/etc/libvirt/qemu.conf |
111 | 111 |
|
112 | 112 |
# Set default defaults here as some hypervisor drivers override these |
113 | 113 |
PUBLIC_INTERFACE_DEFAULT=br100 |
114 |
-FLAT_NETWORK_BRIDGE_DEFAULT=br100 |
|
115 | 114 |
# Set ``GUEST_INTERFACE_DEFAULT`` to some interface on the box so that |
116 | 115 |
# the default isn't completely crazy. This will match ``eth*``, ``em*``, or |
117 | 116 |
# the new ``p*`` interfaces, then basically picks the first |
... | ... |
@@ -137,44 +134,6 @@ if is_service_enabled nova && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; th |
137 | 137 |
source $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER |
138 | 138 |
fi |
139 | 139 |
|
140 |
- |
|
141 |
-# Nova Network Configuration |
|
142 |
-# -------------------------- |
|
143 |
- |
|
144 |
-NETWORK_MANAGER=${NETWORK_MANAGER:-${NET_MAN:-FlatDHCPManager}} |
|
145 |
- |
|
146 |
-VLAN_INTERFACE=${VLAN_INTERFACE:-$GUEST_INTERFACE_DEFAULT} |
|
147 |
-FLAT_NETWORK_BRIDGE=${FLAT_NETWORK_BRIDGE:-$FLAT_NETWORK_BRIDGE_DEFAULT} |
|
148 |
- |
|
149 |
-# If you are using the FlatDHCP network mode on multiple hosts, set the |
|
150 |
-# ``FLAT_INTERFACE`` variable but make sure that the interface doesn't already |
|
151 |
-# have an IP or you risk breaking things. |
|
152 |
-# |
|
153 |
-# **DHCP Warning**: If your flat interface device uses DHCP, there will be a |
|
154 |
-# hiccup while the network is moved from the flat interface to the flat network |
|
155 |
-# bridge. This will happen when you launch your first instance. Upon launch |
|
156 |
-# you will lose all connectivity to the node, and the VM launch will probably |
|
157 |
-# fail. |
|
158 |
-# |
|
159 |
-# If you are running on a single node and don't need to access the VMs from |
|
160 |
-# devices other than that node, you can set ``FLAT_INTERFACE=`` |
|
161 |
-# This will stop nova from bridging any interfaces into ``FLAT_NETWORK_BRIDGE``. |
|
162 |
-FLAT_INTERFACE=${FLAT_INTERFACE:-$GUEST_INTERFACE_DEFAULT} |
|
163 |
- |
|
164 |
-# ``MULTI_HOST`` is a mode where each compute node runs its own network node. This |
|
165 |
-# allows network operations and routing for a VM to occur on the server that is |
|
166 |
-# running the VM - removing a SPOF and bandwidth bottleneck. |
|
167 |
-MULTI_HOST=$(trueorfalse False MULTI_HOST) |
|
168 |
- |
|
169 |
-# ``NOVA_ALLOW_MOVE_TO_SAME_HOST`` can be set to False in multi node DevStack, |
|
170 |
-# where there are at least two nova-computes. |
|
171 |
-NOVA_ALLOW_MOVE_TO_SAME_HOST=$(trueorfalse True NOVA_ALLOW_MOVE_TO_SAME_HOST) |
|
172 |
- |
|
173 |
-# Test floating pool and range are used for testing. They are defined |
|
174 |
-# here until the admin APIs can replace nova-manage |
|
175 |
-TEST_FLOATING_POOL=${TEST_FLOATING_POOL:-test} |
|
176 |
-TEST_FLOATING_RANGE=${TEST_FLOATING_RANGE:-192.168.253.0/29} |
|
177 |
- |
|
178 | 140 |
# Other Nova configurations |
179 | 141 |
# ---------------------------- |
180 | 142 |
|
... | ... |
@@ -183,6 +142,10 @@ TEST_FLOATING_RANGE=${TEST_FLOATING_RANGE:-192.168.253.0/29} |
183 | 183 |
# and Glance. |
184 | 184 |
NOVA_USE_SERVICE_TOKEN=$(trueorfalse False NOVA_USE_SERVICE_TOKEN) |
185 | 185 |
|
186 |
+# ``NOVA_ALLOW_MOVE_TO_SAME_HOST`` can be set to False in multi node DevStack, |
|
187 |
+# where there are at least two nova-computes. |
|
188 |
+NOVA_ALLOW_MOVE_TO_SAME_HOST=$(trueorfalse True NOVA_ALLOW_MOVE_TO_SAME_HOST) |
|
189 |
+ |
|
186 | 190 |
# Enable debugging levels for iscsid service (goes from 0-8) |
187 | 191 |
ISCSID_DEBUG=$(trueorfalse False ISCSID_DEBUG) |
188 | 192 |
ISCSID_DEBUG_LEVEL=${ISCSID_DEBUG_LEVEL:-4} |
... | ... |
@@ -198,13 +161,6 @@ function is_nova_enabled { |
198 | 198 |
return 1 |
199 | 199 |
} |
200 | 200 |
|
201 |
-# Test if any Nova Cell services are enabled |
|
202 |
-# is_nova_enabled |
|
203 |
-function is_n-cell_enabled { |
|
204 |
- [[ ,${ENABLED_SERVICES} =~ ,"n-cell" ]] && return 0 |
|
205 |
- return 1 |
|
206 |
-} |
|
207 |
- |
|
208 | 201 |
# is_nova_console_proxy_compute_tls_enabled() - Test if the Nova Console Proxy |
209 | 202 |
# service has TLS enabled |
210 | 203 |
function is_nova_console_proxy_compute_tls_enabled { |
... | ... |
@@ -501,10 +457,6 @@ function create_nova_conf { |
501 | 501 |
if [ -n "$NOVA_INSTANCES_PATH" ]; then |
502 | 502 |
iniset $NOVA_CONF DEFAULT instances_path "$NOVA_INSTANCES_PATH" |
503 | 503 |
fi |
504 |
- if [ "$MULTI_HOST" != "False" ]; then |
|
505 |
- iniset $NOVA_CONF DEFAULT multi_host "True" |
|
506 |
- iniset $NOVA_CONF DEFAULT send_arp_for_ha "True" |
|
507 |
- fi |
|
508 | 504 |
if [ "$SYSLOG" != "False" ]; then |
509 | 505 |
iniset $NOVA_CONF DEFAULT use_syslog "True" |
510 | 506 |
fi |
... | ... |
@@ -551,21 +503,6 @@ function create_nova_conf { |
551 | 551 |
|
552 | 552 |
iniset $NOVA_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT" |
553 | 553 |
|
554 |
- # Setup logging for nova-dhcpbridge command line |
|
555 |
- sudo cp "$NOVA_CONF" "$NOVA_CONF_DIR/nova-dhcpbridge.conf" |
|
556 |
- |
|
557 |
- if is_service_enabled n-net; then |
|
558 |
- local service="n-dhcp" |
|
559 |
- local logfile="${service}.log.${CURRENT_LOG_TIME}" |
|
560 |
- local real_logfile="${LOGDIR}/${logfile}" |
|
561 |
- if [[ -n ${LOGDIR} ]]; then |
|
562 |
- bash -c "cd '$LOGDIR' && ln -sf '$logfile' ${service}.log" |
|
563 |
- iniset "$NOVA_CONF_DIR/nova-dhcpbridge.conf" DEFAULT log_file "$real_logfile" |
|
564 |
- fi |
|
565 |
- |
|
566 |
- iniset $NOVA_CONF DEFAULT dhcpbridge_flagfile "$NOVA_CONF_DIR/nova-dhcpbridge.conf" |
|
567 |
- fi |
|
568 |
- |
|
569 | 554 |
if [ "$NOVA_USE_SERVICE_TOKEN" == "True" ]; then |
570 | 555 |
init_nova_service_user_conf |
571 | 556 |
fi |
... | ... |
@@ -748,42 +685,6 @@ function conductor_conf { |
748 | 748 |
echo "${NOVA_CONF_DIR}/nova_cell${cell}.conf" |
749 | 749 |
} |
750 | 750 |
|
751 |
-function init_nova_cells { |
|
752 |
- if is_service_enabled n-cell; then |
|
753 |
- cp $NOVA_CONF $NOVA_CELLS_CONF |
|
754 |
- iniset $NOVA_CELLS_CONF database connection `database_connection_url $NOVA_CELLS_DB` |
|
755 |
- rpc_backend_add_vhost child_cell |
|
756 |
- iniset_rpc_backend nova $NOVA_CELLS_CONF DEFAULT child_cell |
|
757 |
- iniset $NOVA_CELLS_CONF DEFAULT dhcpbridge_flagfile $NOVA_CELLS_CONF |
|
758 |
- iniset $NOVA_CELLS_CONF cells enable True |
|
759 |
- iniset $NOVA_CELLS_CONF cells cell_type compute |
|
760 |
- iniset $NOVA_CELLS_CONF cells name child |
|
761 |
- |
|
762 |
- iniset $NOVA_CONF cells enable True |
|
763 |
- iniset $NOVA_CONF cells cell_type api |
|
764 |
- iniset $NOVA_CONF cells name region |
|
765 |
- |
|
766 |
- if is_service_enabled n-api-meta; then |
|
767 |
- NOVA_ENABLED_APIS=$(echo $NOVA_ENABLED_APIS | sed "s/,metadata//") |
|
768 |
- iniset $NOVA_CONF DEFAULT enabled_apis $NOVA_ENABLED_APIS |
|
769 |
- iniset $NOVA_CELLS_CONF DEFAULT enabled_apis metadata |
|
770 |
- fi |
|
771 |
- |
|
772 |
- # Cells v1 conductor should be the nova-cells.conf |
|
773 |
- NOVA_COND_CONF=$NOVA_CELLS_CONF |
|
774 |
- |
|
775 |
- time_start "dbsync" |
|
776 |
- $NOVA_BIN_DIR/nova-manage --config-file $NOVA_CELLS_CONF db sync |
|
777 |
- time_stop "dbsync" |
|
778 |
- $NOVA_BIN_DIR/nova-manage --config-file $NOVA_CELLS_CONF cell create --name=region --cell_type=parent --username=$RABBIT_USERID --hostname=$RABBIT_HOST --port=5672 --password=$RABBIT_PASSWORD --virtual_host=/ --woffset=0 --wscale=1 |
|
779 |
- $NOVA_BIN_DIR/nova-manage cell create --name=child --cell_type=child --username=$RABBIT_USERID --hostname=$RABBIT_HOST --port=5672 --password=$RABBIT_PASSWORD --virtual_host=child_cell --woffset=0 --wscale=1 |
|
780 |
- |
|
781 |
- # Creates the single cells v2 cell for the child cell (v1) nova db. |
|
782 |
- $NOVA_BIN_DIR/nova-manage --config-file $NOVA_CELLS_CONF cell_v2 create_cell \ |
|
783 |
- --transport-url $(get_transport_url child_cell) --name 'cell1' |
|
784 |
- fi |
|
785 |
-} |
|
786 |
- |
|
787 | 751 |
# create_nova_cache_dir() - Part of the init_nova() process |
788 | 752 |
function create_nova_cache_dir { |
789 | 753 |
# Create cache dir |
... | ... |
@@ -791,18 +692,6 @@ function create_nova_cache_dir { |
791 | 791 |
rm -f $NOVA_AUTH_CACHE_DIR/* |
792 | 792 |
} |
793 | 793 |
|
794 |
-function create_nova_conf_nova_network { |
|
795 |
- local public_interface=${PUBLIC_INTERFACE:-$PUBLIC_INTERFACE_DEFAULT} |
|
796 |
- iniset $NOVA_CONF DEFAULT network_manager "nova.network.manager.$NETWORK_MANAGER" |
|
797 |
- iniset $NOVA_CONF DEFAULT public_interface "$public_interface" |
|
798 |
- iniset $NOVA_CONF DEFAULT vlan_interface "$VLAN_INTERFACE" |
|
799 |
- iniset $NOVA_CONF DEFAULT flat_network_bridge "$FLAT_NETWORK_BRIDGE" |
|
800 |
- if [ -n "$FLAT_INTERFACE" ]; then |
|
801 |
- iniset $NOVA_CONF DEFAULT flat_interface "$FLAT_INTERFACE" |
|
802 |
- fi |
|
803 |
- iniset $NOVA_CONF DEFAULT use_neutron False |
|
804 |
-} |
|
805 |
- |
|
806 | 794 |
# create_nova_keys_dir() - Part of the init_nova() process |
807 | 795 |
function create_nova_keys_dir { |
808 | 796 |
# Create keys dir |
... | ... |
@@ -834,10 +723,6 @@ function init_nova { |
834 | 834 |
# Migrate nova and nova_cell0 databases. |
835 | 835 |
$NOVA_BIN_DIR/nova-manage --config-file $NOVA_CONF db sync |
836 | 836 |
|
837 |
- if is_service_enabled n-cell; then |
|
838 |
- recreate_database $NOVA_CELLS_DB |
|
839 |
- fi |
|
840 |
- |
|
841 | 837 |
# Run online migrations on the new databases |
842 | 838 |
# Needed for flavor conversion |
843 | 839 |
$NOVA_BIN_DIR/nova-manage --config-file $NOVA_CONF db online_data_migrations |
... | ... |
@@ -942,15 +827,6 @@ function start_nova_api { |
942 | 942 |
export PATH=$old_path |
943 | 943 |
} |
944 | 944 |
|
945 |
-# Detect and setup conditions under which singleconductor setup is |
|
946 |
-# needed. Notably cellsv1. |
|
947 |
-function _set_singleconductor { |
|
948 |
- # NOTE(danms): Don't setup conductor fleet for cellsv1 |
|
949 |
- if is_service_enabled n-cell; then |
|
950 |
- CELLSV2_SETUP="singleconductor" |
|
951 |
- fi |
|
952 |
-} |
|
953 |
- |
|
954 | 945 |
|
955 | 946 |
# start_nova_compute() - Start the compute process |
956 | 947 |
function start_nova_compute { |
... | ... |
@@ -958,11 +834,7 @@ function start_nova_compute { |
958 | 958 |
local old_path=$PATH |
959 | 959 |
export PATH=$NOVA_BIN_DIR:$PATH |
960 | 960 |
|
961 |
- if is_service_enabled n-cell; then |
|
962 |
- local compute_cell_conf=$NOVA_CELLS_CONF |
|
963 |
- else |
|
964 |
- local compute_cell_conf=$NOVA_CONF |
|
965 |
- fi |
|
961 |
+ local compute_cell_conf=$NOVA_CONF |
|
966 | 962 |
|
967 | 963 |
cp $compute_cell_conf $NOVA_CPU_CONF |
968 | 964 |
|
... | ... |
@@ -1025,22 +897,7 @@ function start_nova_rest { |
1025 | 1025 |
export PATH=$NOVA_BIN_DIR:$PATH |
1026 | 1026 |
|
1027 | 1027 |
local api_cell_conf=$NOVA_CONF |
1028 |
- if is_service_enabled n-cell; then |
|
1029 |
- local compute_cell_conf=$NOVA_CELLS_CONF |
|
1030 |
- else |
|
1031 |
- local compute_cell_conf=$NOVA_CONF |
|
1032 |
- fi |
|
1033 |
- |
|
1034 |
- # ``run_process`` checks ``is_service_enabled``, it is not needed here |
|
1035 |
- run_process n-cell-region "$NOVA_BIN_DIR/nova-cells --config-file $api_cell_conf" |
|
1036 |
- run_process n-cell-child "$NOVA_BIN_DIR/nova-cells --config-file $compute_cell_conf" |
|
1037 |
- |
|
1038 |
- if is_service_enabled n-net; then |
|
1039 |
- if ! running_in_container; then |
|
1040 |
- enable_kernel_bridge_firewall |
|
1041 |
- fi |
|
1042 |
- fi |
|
1043 |
- run_process n-net "$NOVA_BIN_DIR/nova-network --config-file $compute_cell_conf" |
|
1028 |
+ local compute_cell_conf=$NOVA_CONF |
|
1044 | 1029 |
|
1045 | 1030 |
run_process n-sch "$NOVA_BIN_DIR/nova-scheduler --config-file $compute_cell_conf" |
1046 | 1031 |
if [ "$NOVA_USE_MOD_WSGI" == "False" ]; then |
... | ... |
@@ -1049,9 +906,6 @@ function start_nova_rest { |
1049 | 1049 |
run_process n-api-meta "$NOVA_BIN_DIR/uwsgi --procname-prefix nova-api-meta --ini $NOVA_METADATA_UWSGI_CONF" |
1050 | 1050 |
fi |
1051 | 1051 |
|
1052 |
- # nova-consoleauth always runs globally |
|
1053 |
- run_process n-cauth "$NOVA_BIN_DIR/nova-consoleauth --config-file $api_cell_conf" |
|
1054 |
- |
|
1055 | 1052 |
export PATH=$old_path |
1056 | 1053 |
} |
1057 | 1054 |
|
... | ... |
@@ -1129,11 +983,7 @@ function is_nova_ready { |
1129 | 1129 |
# happen between here and the script ending. However, in multinode |
1130 | 1130 |
# tests this can very often not be the case. So ensure that the |
1131 | 1131 |
# compute is up before we move on. |
1132 |
- if is_service_enabled n-cell; then |
|
1133 |
- # cells v1 can't complete the check below because it munges |
|
1134 |
- # hostnames with cell information (grumble grumble). |
|
1135 |
- return |
|
1136 |
- fi |
|
1132 |
+ |
|
1137 | 1133 |
# TODO(sdague): honestly, this probably should be a plug point for |
1138 | 1134 |
# an external system. |
1139 | 1135 |
if [[ "$VIRT_DRIVER" == 'xenserver' ]]; then |
... | ... |
@@ -1145,8 +995,6 @@ function is_nova_ready { |
1145 | 1145 |
} |
1146 | 1146 |
|
1147 | 1147 |
function start_nova { |
1148 |
- # this catches the cells v1 case early |
|
1149 |
- _set_singleconductor |
|
1150 | 1148 |
start_nova_rest |
1151 | 1149 |
start_nova_console_proxies |
1152 | 1150 |
start_nova_conductor |
... | ... |
@@ -1174,7 +1022,7 @@ function stop_nova_compute { |
1174 | 1174 |
|
1175 | 1175 |
function stop_nova_rest { |
1176 | 1176 |
# Kill the non-compute nova processes |
1177 |
- for serv in n-api n-api-meta n-net n-sch n-cauth n-cell n-cell; do |
|
1177 |
+ for serv in n-api n-api-meta n-sch; do |
|
1178 | 1178 |
stop_process $serv |
1179 | 1179 |
done |
1180 | 1180 |
} |
... | ... |
@@ -24,9 +24,6 @@ set +o xtrace |
24 | 24 |
# Defaults |
25 | 25 |
# -------- |
26 | 26 |
|
27 |
-# Allow ``build_domU.sh`` to specify the flat network bridge via kernel args |
|
28 |
-FLAT_NETWORK_BRIDGE_DEFAULT=$(sed -e 's/.* flat_network_bridge=\([[:alnum:]]*\).*$/\1/g' /proc/cmdline) |
|
29 |
- |
|
30 | 27 |
VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS=169.254.0.1} |
31 | 28 |
|
32 | 29 |
|
... | ... |
@@ -342,7 +342,7 @@ function configure_tempest { |
342 | 342 |
iniset $TEMPEST_CONFIG compute flavor_ref $flavor_ref |
343 | 343 |
iniset $TEMPEST_CONFIG compute flavor_ref_alt $flavor_ref_alt |
344 | 344 |
iniset $TEMPEST_CONFIG validation connect_method $ssh_connect_method |
345 |
- if ! is_service_enabled n-cell && ! is_service_enabled neutron; then |
|
345 |
+ if ! is_service_enabled neutron; then |
|
346 | 346 |
iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME |
347 | 347 |
fi |
348 | 348 |
|
... | ... |
@@ -391,24 +391,6 @@ function configure_tempest { |
391 | 391 |
iniset $TEMPEST_CONFIG compute-feature-enabled scheduler_enabled_filters ${NOVA_FILTERS} |
392 | 392 |
fi |
393 | 393 |
|
394 |
- if is_service_enabled n-cell; then |
|
395 |
- # Cells doesn't support shelving/unshelving |
|
396 |
- iniset $TEMPEST_CONFIG compute-feature-enabled shelve False |
|
397 |
- # Cells doesn't support hot-plugging virtual interfaces. |
|
398 |
- iniset $TEMPEST_CONFIG compute-feature-enabled interface_attach False |
|
399 |
- # Cells v1 doesn't support the rescue/unrescue tests in Tempest |
|
400 |
- iniset $TEMPEST_CONFIG compute-feature-enabled rescue False |
|
401 |
- |
|
402 |
- if [[ -z "$DEFAULT_INSTANCE_TYPE" ]]; then |
|
403 |
- # Cells supports resize but does not currently work with devstack |
|
404 |
- # because of the custom flavors created for Tempest runs which are |
|
405 |
- # not in the cells database. |
|
406 |
- # TODO(mriedem): work on adding a nova-manage command to sync |
|
407 |
- # flavors into the cells database. |
|
408 |
- iniset $TEMPEST_CONFIG compute-feature-enabled resize False |
|
409 |
- fi |
|
410 |
- fi |
|
411 |
- |
|
412 | 394 |
if [[ $ENABLE_VOLUME_MULTIATTACH == "True" ]]; then |
413 | 395 |
iniset $TEMPEST_CONFIG compute-feature-enabled volume_multiattach True |
414 | 396 |
fi |
... | ... |
@@ -554,8 +536,7 @@ function configure_tempest { |
554 | 554 |
iniset $TEMPEST_CONFIG compute-feature-enabled shelve False |
555 | 555 |
iniset $TEMPEST_CONFIG compute-feature-enabled snapshot False |
556 | 556 |
iniset $TEMPEST_CONFIG compute-feature-enabled suspend False |
557 |
- elif ! is_service_enabled n-cell; then |
|
558 |
- # cells v1 does not support swapping volumes |
|
557 |
+ else |
|
559 | 558 |
iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume True |
560 | 559 |
fi |
561 | 560 |
fi |
... | ... |
@@ -1167,10 +1167,11 @@ if is_service_enabled neutron; then |
1167 | 1167 |
fi |
1168 | 1168 |
fi |
1169 | 1169 |
|
1170 |
+ |
|
1170 | 1171 |
# Nova |
1171 | 1172 |
# ---- |
1172 | 1173 |
|
1173 |
-if is_service_enabled n-net q-dhcp; then |
|
1174 |
+if is_service_enabled q-dhcp; then |
|
1174 | 1175 |
# Delete traces of nova networks from prior runs |
1175 | 1176 |
# Do not kill any dnsmasq instance spawned by NetworkManager |
1176 | 1177 |
netman_pid=$(pidof NetworkManager || true) |
... | ... |
@@ -1182,12 +1183,6 @@ if is_service_enabled n-net q-dhcp; then |
1182 | 1182 |
|
1183 | 1183 |
clean_iptables |
1184 | 1184 |
|
1185 |
- if is_service_enabled n-net; then |
|
1186 |
- rm -rf ${NOVA_STATE_PATH}/networks |
|
1187 |
- sudo mkdir -p ${NOVA_STATE_PATH}/networks |
|
1188 |
- safe_chown -R ${STACK_USER} ${NOVA_STATE_PATH}/networks |
|
1189 |
- fi |
|
1190 |
- |
|
1191 | 1185 |
# Force IP forwarding on, just in case |
1192 | 1186 |
sudo sysctl -w net.ipv4.ip_forward=1 |
1193 | 1187 |
fi |
... | ... |
@@ -1226,13 +1221,11 @@ if is_service_enabled nova; then |
1226 | 1226 |
init_nova |
1227 | 1227 |
|
1228 | 1228 |
# Additional Nova configuration that is dependent on other services |
1229 |
+ # TODO(stephenfin): Is it possible for neutron to *not* be enabled now? If |
|
1230 |
+ # not, remove the if here |
|
1229 | 1231 |
if is_service_enabled neutron; then |
1230 | 1232 |
configure_neutron_nova |
1231 |
- elif is_service_enabled n-net; then |
|
1232 |
- create_nova_conf_nova_network |
|
1233 | 1233 |
fi |
1234 |
- |
|
1235 |
- init_nova_cells |
|
1236 | 1234 |
fi |
1237 | 1235 |
|
1238 | 1236 |
|
... | ... |
@@ -1314,20 +1307,6 @@ elif is_service_enabled q-svc; then |
1314 | 1314 |
echo_summary "Starting Neutron" |
1315 | 1315 |
configure_neutron_after_post_config |
1316 | 1316 |
start_neutron_service_and_check |
1317 |
-elif is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-net; then |
|
1318 |
- NM_CONF=${NOVA_CONF} |
|
1319 |
- if is_service_enabled n-cell; then |
|
1320 |
- NM_CONF=${NOVA_CELLS_CONF} |
|
1321 |
- fi |
|
1322 |
- |
|
1323 |
- # Create a small network |
|
1324 |
- $NOVA_BIN_DIR/nova-manage --config-file $NM_CONF network create "$PRIVATE_NETWORK_NAME" $FIXED_RANGE 1 $FIXED_NETWORK_SIZE $NETWORK_CREATE_ARGS |
|
1325 |
- |
|
1326 |
- # Create some floating ips |
|
1327 |
- $NOVA_BIN_DIR/nova-manage --config-file $NM_CONF floating create $FLOATING_RANGE --pool=$PUBLIC_NETWORK_NAME |
|
1328 |
- |
|
1329 |
- # Create a second pool |
|
1330 |
- $NOVA_BIN_DIR/nova-manage --config-file $NM_CONF floating create --ip_range=$TEST_FLOATING_RANGE --pool=$TEST_FLOATING_POOL |
|
1331 | 1317 |
fi |
1332 | 1318 |
|
1333 | 1319 |
# Start placement before any of the service that are likely to want |
... | ... |
@@ -65,7 +65,7 @@ if ! isset ENABLED_SERVICES ; then |
65 | 65 |
# Keystone - nothing works without keystone |
66 | 66 |
ENABLED_SERVICES=key |
67 | 67 |
# Nova - services to support libvirt based openstack clouds |
68 |
- ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-novnc,n-cauth,n-api-meta |
|
68 |
+ ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-novnc,n-api-meta |
|
69 | 69 |
# Placement service needed for Nova |
70 | 70 |
ENABLED_SERVICES+=,placement-api,placement-client |
71 | 71 |
# Glance services needed for Nova |
... | ... |
@@ -846,7 +846,6 @@ ENABLE_DEBUG_LOG_LEVEL=$(trueorfalse True ENABLE_DEBUG_LOG_LEVEL) |
846 | 846 |
FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.0/24} |
847 | 847 |
IPV4_ADDRS_SAFE_TO_USE=${IPV4_ADDRS_SAFE_TO_USE:-10.0.0.0/22} |
848 | 848 |
FIXED_RANGE=${FIXED_RANGE:-$IPV4_ADDRS_SAFE_TO_USE} |
849 |
-FIXED_NETWORK_SIZE=${FIXED_NETWORK_SIZE:-256} |
|
850 | 849 |
HOST_IP_IFACE=${HOST_IP_IFACE:-} |
851 | 850 |
HOST_IP=${HOST_IP:-} |
852 | 851 |
HOST_IPV6=${HOST_IPV6:-} |