Browse code

Merge "Disable track_instance_changes when in superconductor mode"

Jenkins authored on 2017/08/14 17:02:01
Showing 1 changed files
... ...
@@ -443,6 +443,9 @@ function create_nova_conf {
443 443
             local db="nova_cell1"
444 444
         else
445 445
             local db="nova_cell0"
446
+            # When in superconductor mode, nova-compute can't send instance
447
+            # info updates to the scheduler, so just disable it.
448
+            iniset $NOVA_CONF filter_scheduler track_instance_changes False
446 449
         fi
447 450
 
448 451
         iniset $NOVA_CONF database connection `database_connection_url $db`
... ...
@@ -846,6 +849,9 @@ function start_nova_compute {
846 846
         cp $compute_cell_conf $NOVA_CPU_CONF
847 847
         # FIXME(danms): Should this be configurable?
848 848
         iniset $NOVA_CPU_CONF workarounds disable_group_policy_check_upcall True
849
+        # Since the nova-compute service cannot reach nova-scheduler over
850
+        # RPC, we also disable track_instance_changes.
851
+        iniset $NOVA_CPU_CONF filter_scheduler track_instance_changes False
849 852
         iniset_rpc_backend nova $NOVA_CPU_CONF DEFAULT "nova_cell${NOVA_CPU_CELL}"
850 853
     fi
851 854