Merge pull request #45 from vexxhost/metadata-filter
Metadata filter modified.
diff --git a/staffeln/conductor/backup.py b/staffeln/conductor/backup.py
index 519b81c..d5807a4 100755
--- a/staffeln/conductor/backup.py
+++ b/staffeln/conductor/backup.py
@@ -65,12 +65,14 @@
# Backup the volumes attached to which has a specific metadata
def filter_by_server_metadata(self, metadata):
+ if CONF.conductor.backup_metadata_key is not None:
+ if not CONF.conductor.backup_metadata_key in metadata:
+ return False
- if not CONF.conductor.backup_metadata_key in metadata:
+ return metadata[CONF.conductor.backup_metadata_key].lower() == constants.BACKUP_ENABLED_KEY
+ else:
return True
- return metadata[CONF.conductor.backup_metadata_key].lower() == constants.BACKUP_ENABLED_KEY
-
# Backup the volumes in in-use and available status
def filter_by_volume_status(self, volume_id, project_id):
try:
diff --git a/staffeln/conf/conductor.py b/staffeln/conf/conductor.py
index d5e3861..69f7fe2 100755
--- a/staffeln/conf/conductor.py
+++ b/staffeln/conf/conductor.py
@@ -30,7 +30,6 @@
),
cfg.StrOpt(
"backup_metadata_key",
- default="__automated_backup",
help=_("The key string of metadata the VM, which requres back up, has"),
),
]