Deleting enabled domain results in confusing error

[Steven Hardy]

# openstack --os-token foobar --os-url=http://127.0.0.1:5000/v3 --os-identity-api-version=3 domain create heat
+---------+---------------------------------------------------------------------------------------+
| Field | Value |
+---------+---------------------------------------------------------------------------------------+
| enabled | True |
| id | b1816241c3bd4a67b4059dcf62526e31 |
| links | {u'self': u'http://192.168.122.214:5000/v3/domains/b1816241c3bd4a67b4059dcf62526e31'} |
| name | heat |
+---------+---------------------------------------------------------------------------------------+

# openstack --os-token foobar --os-url=http://127.0.0.1:5000/v3 --os-identity-api-version=3 domain delete heat
ERROR: cliff.app You are not authorized to perform the requested action, delete a domain that is not disabled. (HTTP 403)

This, to me at least, is confusing - from a user perspective, it sounds like an instruction to delete a domain that is not disabled (i.e one which is enabled, which it is!), rather than information that you can only delete a domain which is not *enabled*

Rewording this slightly would make the user-visible error clearer IMO:

# openstack --os-token foobar --os-url=http://127.0.0.1:5000/v3 --os-identity-api-version=3 domain delete heat
ERROR: cliff.app You are not authorized to perform the requested action, can't delete a domain that is enabled. (HTTP 403)

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/73299
Committed: https://git.openstack.org/cgit/openstack/keystone/commit/?id=1878300dacfd25b02563a5cef5c473fbed4861f2
Submitter: Jenkins
Branch: master

commit 1878300dacfd25b02563a5cef5c473fbed4861f2
Author: Steven Hardy <email address hidden>
Date: Thu Feb 13 14:23:31 2014 +0000

    Provide clearer error when deleting enabled domain

    Currently the message is confusing, because it reads like an instruction
    to delete an enabled domain, rather than an instruction that you can
    only delete disabled domains. Hopefully this wording is a little clearer
    for users.

    Change-Id: I5189cd1bbae0e485d03660be19f20879110a3b3e
    Closes-Bug: #1279823