x
/
fuel-ccp
Code Issues Proposed changes

Merge "[deploy] Fix macros files naming issue"

This commit is contained in:
Jenkins 2017-01-13 10:05:39 +00:00 committed by Gerrit Code Review
parent e636e0fc99 dcb5ca2187
commit 9232af00d5
4 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuel_ccp/common/jinja_utils.py
View File

@ -50,10 +50,11 @@ def jinja_render(path, context, functions=(), ignore_undefined=False):
return content
def generate_jinja_imports(filenames):
"""Generate str of jinja imports from list of filenames."""
def generate_jinja_imports(exports_map):
"""Generate a files header of jinja imports from exports map"""
imports = [] # list of j2 imports: "{% import 'msg.j2' as msg %}"
for name in filenames:
for export_key in exports_map:
name = exports_map[export_key]['name'] # real filename
import_as, extension = os.path.splitext(name) # remove file extension
if not re.match('[a-zA-Z_][a-zA-Z0-9_]*', import_as):
raise RuntimeError('Wrong templates file naming: the %s cannot be '

21
fuel_ccp/common/utils.py
View File

@ -85,23 +85,22 @@ def address(service, port=None, external=False, with_scheme=False):
return addr
def get_repositories_exports(repos_names=None):
"""Load shared templates from ./export dirs of the repositories. """
def get_repositories_exports():
"""Load shared templates from ./exports dirs of the repositories. """
exports = dict()
for repo in get_repositories_paths():
exports_dir = os.path.join(repo, 'exports')
if os.path.exists(exports_dir) and os.path.isdir(exports_dir):
for export in os.listdir(exports_dir):
path = os.path.join(exports_dir, export)
for export_file in os.listdir(exports_dir):
# Due to k8s keys constraints we need to remove non-alpha
cm_key = ''.join([c for c in export_file if c.isalpha()])
path = os.path.join(exports_dir, export_file)
LOG.debug('Found shared jinja template file %s', path)
if export not in exports:
exports[export] = list()
if cm_key not in exports:
exports[cm_key] = {'name': export_file, 'body': ''}
# Merge the files with same name
with open(path) as f:
exports[export].append(f.read())
for export in exports:
exports[export] = '\n'.join(exports[export])
exports[cm_key]['body'] += f.read() + '\n'
return exports

43
fuel_ccp/deploy.py
View File

@ -72,7 +72,8 @@ def process_files(files, service_dir):
f["content"] = content
def parse_role(component, topology, configmaps, jinja_imports):
def parse_role(component, topology, configmaps):
service_dir = component["service_dir"]
role = component["service_content"]
component_name = component["component_name"]
@ -80,11 +81,11 @@ def parse_role(component, topology, configmaps, jinja_imports):
service_name = service["name"]
LOG.info("Scheduling service %s deployment", service_name)
_expand_files(service, role.get("files"))
process_files(role.get("files"), service_dir)
files_cm = _create_files_configmap(service_name, role.get("files"),
jinja_imports)
files = role.get("files")
files_header = service['exports_ctx']['files_header']
_expand_files(service, files)
process_files(files, service_dir)
files_cm = _create_files_configmap(service_name, files, files_header)
meta_cm = _create_meta_configmap(service)
workflows = _parse_workflows(service)
@ -95,7 +96,7 @@ def parse_role(component, topology, configmaps, jinja_imports):
cm_version = 'dry-run'
else:
cm_version = _get_configmaps_version(
configmaps, service_dir, role.get("files"), CONF.configs._dict)
configmaps, service_dir, files, CONF.configs._dict)
for cont in service["containers"]:
daemon_cmd = cont["daemon"]
@ -348,10 +349,13 @@ def _create_meta_configmap(service):
return kubernetes.process_object(template)
def _create_jinja_templates_configmap(templates_files):
def _create_exports_configmap(exports_map):
"""Create config map of files from fuel-ccp-repo/exports dirs."""
exported_files_content = {}
for key in exports_map:
exported_files_content[key] = exports_map[key]['body']
serialized = templates.serialize_configmap(templates.EXPORTS_CONFIG,
templates_files)
exported_files_content)
return kubernetes.process_object(serialized)
@ -564,16 +568,20 @@ def deploy_components(components_map, components):
_create_globals_configmap(CONF.configs)
start_script_cm = create_start_script_configmap()
# Create cm with jinja config templates shared across all repositories.
templates_files = utils.get_repositories_exports()
jinja_imports = jinja_utils.generate_jinja_imports(templates_files.keys())
templates_cm = _create_jinja_templates_configmap(templates_files)
configmaps = (start_script_cm, templates_cm)
# load exported j2 templates, which can be used across all repositories
exports_map = utils.get_repositories_exports()
j2_imports_files_header = jinja_utils.generate_jinja_imports(exports_map)
exports_cm = _create_exports_configmap(exports_map)
exports_ctx = {'files_header': j2_imports_files_header, 'map': exports_map}
configmaps = (start_script_cm, exports_cm)
upgrading_components = {}
for service_name in components:
service = components_map[service_name]
objects_gen = parse_role(service, topology, configmaps, jinja_imports)
service["service_content"]['service']['exports_ctx'] = exports_ctx
objects_gen = parse_role(service, topology, configmaps)
objects = list(itertools.chain.from_iterable(objects_gen))
component_name = service['component_name']
do_upgrade = component_name in upgrading_components
@ -603,9 +611,8 @@ def deploy_components(components_map, components):
upgrading_components[component_name][service_name] = objects
for component_name, component_upg in upgrading_components.items():
create_upgrade_jobs(component_name, component_upg,
configmaps, topology,
jinja_imports)
create_upgrade_jobs(component_name, component_upg, configmaps,
topology, j2_imports_files_header)
if 'keystone' in components:
_create_openrc(CONF.configs)

5
fuel_ccp/templates.py
View File

@ -227,6 +227,10 @@ def serialize_volumes(service, for_job=None):
file_items = [{"key": f_name, "path": f_name} for f_name in sorted(files)]
file_items.append({"key": "placeholder", "path": ".placeholder"})
exports_map = service['exports_ctx']['map']
exports_items = [{'key': cm_export_key,
'path': exports_map[cm_export_key]['name']}
for cm_export_key in sorted(exports_map)]
vol_spec = [
{
"name": GLOBAL_CONFIG,
@ -270,6 +274,7 @@ def serialize_volumes(service, for_job=None):
"name": EXPORTS_CONFIG,
"configMap": {
"name": EXPORTS_CONFIG,
"items": exports_items
}
}
]