Merge "Includes snapshot parameter to vertica & couchdb"

This commit is contained in:
Jenkins 2015-03-23 04:58:04 +00:00 committed by Gerrit Code Review
commit fbbb80ede3
2 changed files with 3 additions and 2 deletions

View File

@ -42,7 +42,7 @@ class Manager(periodic_task.PeriodicTasks):
def prepare(self, context, packages, databases, memory_mb, users,
device_path=None, mount_point=None, backup_info=None,
config_contents=None, root_password=None, overrides=None,
cluster_config=None):
cluster_config=None, snapshot=None):
"""
This is called when the Trove instance first comes online.
It is the first RPC message passed from the task manager.

View File

@ -43,7 +43,8 @@ class Manager(periodic_task.PeriodicTasks):
def prepare(self, context, packages, databases, memory_mb, users,
device_path=None, mount_point=None, backup_info=None,
config_contents=None, root_password=None, overrides=None,
cluster_config=None, path_exists_function=os.path.exists):
cluster_config=None,
snapshot=None, path_exists_function=os.path.exists):
"""Makes ready DBAAS on a Guest container."""
try:
LOG.info(_("Setting instance status to BUILDING."))