Allow kolla build customisations to be added

ansible/group_vars/all/kolla

@@ -136,6 +136,14 @@ controller_container_image_sets:
 # Dict mapping Jinja2 block names in kolla's Docker images to their contents.
 kolla_build_blocks: {}
 
+# Dict mapping image customization variable names to their values.
+# Each variable takes the form:
+# <image name>_<customization>_<operation>
+# Hyphens in the image name are replaced with underscores. The customization is
+# most commonly packages. The operation should be one of override, append or
+# remove. The value should be a list.
+kolla_build_customizations: {}
+
 ###############################################################################
 # Kolla-ansible configuration.
 

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

@@ -26,3 +26,11 @@ kolla_sources: {}
 
 # Dict mapping Jinja2 block names in kolla's Docker images to their contents.
 kolla_build_blocks: {}
+
+# Dict mapping image customization variable names to their values.
+# Each variable takes the form:
+# <image name>_<customization>_<operation>
+# Hyphens in the image name are replaced with underscores. The customization is
+# most commonly packages. The operation should be one of override, append or
+# remove. The value should be a list.
+kolla_build_customizations: {}

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

@@ -10,3 +10,8 @@
 {{ '{% endblock %}' }}
 
 {% endfor %}
+
+{% for var_name, var_value in kolla_build_customizations.items() %}
+{{ '{% set ' ~ var_name ~ ' = ' ~ var_value | to_json ~ ' %}' }}
+
+{% endfor %}

etc/kayobe/kolla.yml

@@ -55,6 +55,14 @@
 # Dict mapping Jinja2 block names in kolla's Docker images to their contents.
 #kolla_build_blocks:
 
+# Dict mapping image customization variable names to their values.
+# Each variable takes the form:
+# <image name>_<customization>_<operation>
+# Hyphens in the image name are replaced with underscores. The customization is
+# most commonly packages. The operation should be one of override, append or
+# remove. The value should be a list.
+#kolla_build_customizations:
+
 ###############################################################################
 # Kolla-ansible configuration.