x
/
fuel-ccp
Code Issues Proposed changes

Merge "Add macros support for actions"

This commit is contained in:
Jenkins 2017-02-16 12:35:29 +00:00 committed by Gerrit Code Review
parent 9b28e70091 091af18a80
commit e65b5b8383
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fuel_ccp/action.py
View File

@ -7,6 +7,7 @@ import uuid
from pykube import exceptions as pykube_exc
import yaml
from fuel_ccp.common import jinja_utils
from fuel_ccp.common import utils
from fuel_ccp import config
from fuel_ccp.config import images as config_images
@ -86,14 +87,17 @@ class Action(object):
return json.dumps({"workflow": wf})
def _get_file_templates(self):
# TODO(sreshetniak): use imports and add macros CM
exports_map = utils.get_repositories_exports()
exports_template = jinja_utils.generate_jinja_imports(exports_map)
data = {}
for f in self.files:
template_path = os.path.join(self.component_dir,
"service", "files",
f["content"])
with open(template_path) as filedata:
data[f["content"]] = filedata.read()
data[f["content"]] = exports_template + "\n" + filedata.read()
for ex_item in exports_map.values():
data[ex_item["name"]] = ex_item["body"]
return data
# job methods
@ -136,6 +140,11 @@ class Action(object):
"key": f["content"],
"path": "files/%s" % f["content"]
})
for ex_item in utils.get_repositories_exports().values():
config_volume_items.append({
"key": ex_item["name"],
"path": "exports/%s" % ex_item["name"]
})
pod_spec = {
"metadata": {
"name": self.k8s_name,