1. devstack
  2. Commit e194330f2753c8cacbcb18668ee32b4722cba2ec
Browse code

Don't skip cellsv2 setup for cellsv1

Since cellsv2 setup is no longer optional, we can't even exclude
cellsv1 from this step. Since cellsv1 users can't use the simple
command, this does the individual steps as needed.

Depends-On: Icfbb17cce8ce8b03dc8b7b4ffb202db01e5218a6
Change-Id: I3c9101a34b2bb0804fc4deda62dbb8637e7b8f94

Dan Smith authored on 2017/01/05 00:26:58
Showing 1 changed files
lib/nova
History View file @ e194330
... ... 
@@ -948,7 +948,11 @@ function create_cell {
948 948 
     if ! is_service_enabled n-cell; then
949 949 
         nova-manage cell_v2 simple_cell_setup --transport-url $(get_transport_url)
950 950 
     else
951 
-        echo 'Skipping cellsv2 setup for this cellsv1 configuration'
951 
+        # NOTE(danms): map_cell0 always returns 1 right now; remove this when that is fixed
952 
+        (nova-manage cell_v2 map_cell0 || true)
953 
+        nova-manage --config-file $NOVA_CELLS_CONF  --verbose cell_v2 map_cell_and_hosts \
954 
+                --transport-url $(get_transport_url child_cell) --name 'cell1'
955 
+        nova-manage db sync
952 956 
     fi
953 957 
 }
954 958