Service disabled reason is not cleared on enable

[Russell Bryant]

[rbryant@devstack python-novaclient]$ nova service-list
+------------------+----------+----------+---------+-------+----------------------------+-----------------+
| Binary | Host | Zone | Status | State | Updated_at | Disabled Reason |
+------------------+----------+----------+---------+-------+----------------------------+-----------------+
| nova-conductor | devstack | internal | enabled | up | 2013-07-03T14:18:17.000000 | None |
| nova-compute | devstack | nova | enabled | up | 2013-07-03T14:18:15.000000 | None |
| nova-cert | devstack | internal | enabled | up | 2013-07-03T14:18:16.000000 | None |
| nova-network | devstack | internal | enabled | up | 2013-07-03T14:18:09.000000 | None |
| nova-scheduler | devstack | internal | enabled | up | 2013-07-03T14:18:09.000000 | None |
| nova-consoleauth | devstack | internal | enabled | up | 2013-07-03T14:18:11.000000 | None |
+------------------+----------+----------+---------+-------+----------------------------+-----------------+
[rbryant@devstack python-novaclient]$ nova service-disable devstack nova-compute --reason 'because i said so'
+----------+--------------+----------+-------------------+
| Host | Binary | Status | Disabled Reason |
+----------+--------------+----------+-------------------+
| devstack | nova-compute | disabled | because i said so |
+----------+--------------+----------+-------------------+
[rbryant@devstack python-novaclient]$ nova service-list
+------------------+----------+----------+----------+-------+----------------------------+-------------------+
| Binary | Host | Zone | Status | State | Updated_at | Disabled Reason |
+------------------+----------+----------+----------+-------+----------------------------+-------------------+
| nova-conductor | devstack | internal | enabled | up | 2013-07-03T14:18:37.000000 | None |
| nova-compute | devstack | nova | disabled | up | 2013-07-03T14:18:40.000000 | because i said so |
| nova-cert | devstack | internal | enabled | up | 2013-07-03T14:18:36.000000 | None |
| nova-network | devstack | internal | enabled | up | 2013-07-03T14:18:39.000000 | None |
| nova-scheduler | devstack | internal | enabled | up | 2013-07-03T14:18:39.000000 | None |
| nova-consoleauth | devstack | internal | enabled | up | 2013-07-03T14:18:41.000000 | None |
+------------------+----------+----------+----------+-------+----------------------------+-------------------+
[rbryant@devstack python-novaclient]$ nova service-enable devstack nova-compute
+----------+--------------+---------+
| Host | Binary | Status |
+----------+--------------+---------+
| devstack | nova-compute | enabled |
+----------+--------------+---------+
[rbryant@devstack python-novaclient]$ nova service-list
+------------------+----------+----------+---------+-------+----------------------------+-------------------+
| Binary | Host | Zone | Status | State | Updated_at | Disabled Reason |
+------------------+----------+----------+---------+-------+----------------------------+-------------------+
| nova-conductor | devstack | internal | enabled | up | 2013-07-03T14:18:57.000000 | None |
| nova-compute | devstack | nova | enabled | up | 2013-07-03T14:18:56.000000 | because i said so |
| nova-cert | devstack | internal | enabled | up | 2013-07-03T14:18:56.000000 | None |
| nova-network | devstack | internal | enabled | up | 2013-07-03T14:18:59.000000 | None |
| nova-scheduler | devstack | internal | enabled | up | 2013-07-03T14:18:59.000000 | None |
| nova-consoleauth | devstack | internal | enabled | up | 2013-07-03T14:18:51.000000 | None |
+------------------+----------+----------+---------+-------+----------------------------+-------------------+

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/35508

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/35508
Committed: http://github.com/openstack/nova/commit/16b4efdb0d488478c6f03218931bac4c42a278e3
Submitter: Jenkins
Branch: master

commit 16b4efdb0d488478c6f03218931bac4c42a278e3
Author: Russell Bryant <email address hidden>
Date: Wed Jul 3 12:15:06 2013 -0400

    Clear out service disabled reason on enable

    When a service gets re-enabled, clear out the 'disabled_reason' column.

    Fix bug 1197423.

    Change-Id: I78c9e40c65e96fbc6eff0e3426cfd87b0810cd69