Remove unused/add missed vars
Change-Id: I1c6a2167b267f13cd3a31cf478642ecdeb06e415
This commit is contained in:
parent
5adb1110b7
commit
337a8fe326
|
@ -266,7 +266,7 @@ def get_etcd_client():
|
|||
def check_dependence(dep, etcd_client):
|
||||
LOG.debug("Waiting for \"%s\" dependency", dep)
|
||||
while True:
|
||||
if check_is_ready(dep):
|
||||
if check_is_ready(dep, etcd_client):
|
||||
LOG.debug("Dependency \"%s\" is in \"ready\" state", dep)
|
||||
break
|
||||
LOG.debug("Dependency \"%s\" is not ready yet, retrying", dep)
|
||||
|
@ -324,7 +324,6 @@ def get_workflow(role_name):
|
|||
|
||||
|
||||
def get_variables(role_name):
|
||||
variables = None
|
||||
LOG.info("Getting global variables from %s", GLOBALS_PATH)
|
||||
with open(GLOBALS_PATH) as f:
|
||||
variables = json.load(f)
|
||||
|
@ -384,8 +383,6 @@ def do_provision(role_name):
|
|||
files = workflow.get('files', [])
|
||||
create_files(files)
|
||||
|
||||
etcd_client = None
|
||||
|
||||
dependencies = workflow.get('dependencies')
|
||||
if dependencies:
|
||||
etcd_client = get_etcd_client()
|
||||
|
|
Loading…
Reference in New Issue