Merge "Remove unused variables"

This commit is contained in:
Jenkins 2014-04-04 07:17:00 +00:00 committed by Gerrit Code Review
commit d6fd314555
3 changed files with 0 additions and 9 deletions

View File

@ -28,7 +28,6 @@ from trove.quota.quota import run_with_quotas
CONF = cfg.CONF
LOG = logging.getLogger(__name__)
SWIFT_CONTAINER = CONF.backup_swift_container
class BackupState(object):

View File

@ -33,7 +33,6 @@ from trove.dns.driver import DnsEntry
CONF = cfg.CONF
DNS_HOSTNAME = CONF.dns_hostname
DNS_ACCOUNT_ID = CONF.dns_account_id
DNS_AUTH_URL = CONF.dns_auth_url
DNS_DOMAIN_NAME = CONF.dns_domain_name

View File

@ -117,13 +117,6 @@ def load_simple_instance_server_status(context, db_info):
db_info.addresses = {}
# If the compute server is in any of these states we can't perform any
# actions (delete, resize, etc).
SERVER_INVALID_ACTION_STATUSES = ["BUILD", "REBOOT", "REBUILD", "RESIZE"]
# Statuses in which an instance can have an action performed.
VALID_ACTION_STATUSES = ["ACTIVE"]
# Invalid states to contact the agent
AGENT_INVALID_STATUSES = ["BUILD", "REBOOT", "RESIZE"]