From 65e987aec28a16941d56c0559289ca999c6265c9 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Sun, 13 Nov 2016 13:07:49 +0300 Subject: [PATCH] Sort files in configmap and remove repetition Otherwise some services (neutron-server) receive file lists in different order and roll even if nothing changes. Change-Id: I5299f10996d630d4b12d43ee29e7e5cd879fddd1 --- fuel_ccp/templates.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fuel_ccp/templates.py b/fuel_ccp/templates.py index 24052e55..c6fbf5b1 100644 --- a/fuel_ccp/templates.py +++ b/fuel_ccp/templates.py @@ -193,15 +193,15 @@ def serialize_volumes(service): workflow_items.append( {"key": job["name"], "path": "%s.json" % job["name"]}) - file_items = [] + files = set() for c in service["containers"]: - for f_name, f_item in sorted(c["daemon"].get("files", {}).items()): - file_items.append({"key": f_name, "path": f_name}) + files.update(c["daemon"].get("files", {})) for job_type in ("pre", "post"): for job in c.get(job_type, ()): if job.get("type", "local") == "single" and job.get("files"): - for f_name in job["files"].keys(): - file_items.append({"key": f_name, "path": f_name}) + files.update(job["files"]) + + file_items = [{"key": f_name, "path": f_name} for f_name in sorted(files)] file_items.append({"key": "placeholder", "path": ".placeholder"}) vol_spec = [ {