Add support for configuration of Jinja2 blocks in kolla images

ansible/group_vars/all/kolla

@@ -131,6 +131,9 @@ controller_container_image_regexes: "{{ controller_container_image_regex_map | s
 controller_container_image_sets:
   - regexes: "{{ controller_container_image_regexes | join(' ') }}"
 
+# Dict mapping Jinja2 block names in kolla's Docker images to their contents.
+kolla_build_blocks: {}
+
 ###############################################################################
 # Kolla-ansible configuration.
 

ansible/roles/kolla-build/defaults/main.yml

@@ -23,3 +23,6 @@ kolla_openstack_release:
 #     location: https://github.com/openstack/ironic
 #     reference: master
 kolla_sources: {}
+
+# Dict mapping Jinja2 block names in kolla's Docker images to their contents.
+kolla_build_blocks: {}

ansible/roles/kolla-build/templates/template-override.j2.j2

@@ -3,3 +3,10 @@
 {% raw %}
 {% extends parent_template %}
 {% endraw %}
+
+{% for block_name, block_contents in kolla_build_blocks.items() %}
+{{ '{% block ' ~ block_name ~ ' %}' }}
+{{ block_contents }}
+{{ '{% endblock %}' }}
+
+{% endfor %}

etc/kayobe/kolla.yml

@@ -49,6 +49,12 @@
 #     reference: master
 #kolla_sources:
 
+###############################################################################
+# Kolla image build configuration.
+
+# Dict mapping Jinja2 block names in kolla's Docker images to their contents.
+#kolla_build_blocks:
+
 ###############################################################################
 # Kolla-ansible configuration.