diff options
| author | Yun Mao <yunmao@gmail.com> | 2012-06-08 11:27:20 -0400 |
|---|---|---|
| committer | Yun Mao <yunmao@gmail.com> | 2012-06-20 20:47:24 -0400 |
| commit | 6041ad70d25aa4e015003e9df03d3f9759e09e6e (patch) | |
| tree | 637d6c968f8881956c2ec3281c4177f052409a7f /nova/db | |
| parent | 470ccb85f2ecaff38973854e209f0fabdb117dc0 (diff) | |
Fix bug 1010581
Set shutdown_terminate to False by default.
Fix related tests.
Change-Id: I194ea7f01e375a93ff73ee1560589f0eadc1b965
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index fc458e021..91dae5f0a 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -272,7 +272,9 @@ class Instance(BASE, NovaBase): # EC2 instance_initiated_shutdown_teminate # True: -> 'terminate' # False: -> 'stop' - shutdown_terminate = Column(Boolean(), default=True, nullable=False) + # Note(maoy): currently Nova will always stop instead of terminate + # no matter what the flag says. So we set the default to False. + shutdown_terminate = Column(Boolean(), default=False, nullable=False) # EC2 disable_api_termination disable_terminate = Column(Boolean(), default=False, nullable=False) |