From ce7a0ac53e579d69000415ba261a69d5d4642ce9 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 24 Feb 2017 11:38:53 -0500 Subject: [PATCH] Add TripleO template overrides file This patch adds a template_overrides file which can be used to build Kolla packages that work with TripleO. The intent is to use this for tripleo-ci, and as a default for upcoming python-tripleoclient features to build kolla images for TripleO. This can also be consumed by downstreams like RDO to build TripleO containers. Change-Id: I4d6875990e3d40c537fec1c9493261d3086c1db1 --- contrib/tripleo_kolla_template_overrides.j2 | 30 +++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 contrib/tripleo_kolla_template_overrides.j2 diff --git a/contrib/tripleo_kolla_template_overrides.j2 b/contrib/tripleo_kolla_template_overrides.j2 new file mode 100644 index 000000000..55aaa367c --- /dev/null +++ b/contrib/tripleo_kolla_template_overrides.j2 @@ -0,0 +1,30 @@ +{% extends parent_template %} + +# Disable external repos +{% set base_yum_repo_files_override = [] %} +{% set base_yum_url_packages_override = [] %} +{% set base_yum_repo_keys_override = [] %} + +{% set base_centos_binary_packages_append = ['puppet'] %} +{% set nova_scheduler_packages_append = ['openstack-tripleo-common'] %} + +# Required for mistral-db-populate to load tripleo custom actions on +# the undercloud +{% set mistral_api_packages_append = ['openstack-tripleo-common'] %} +{% set mistral_engine_packages_append = ['openstack-tripleo-common'] %} + +# NOTE: Mistral executor needs to run nova-manage cells_v2 commands on +# the undercloud baremetal workflows. +{% set mistral_executor_packages_append = ['openstack-tripleo-common', 'openstack-nova-common'] %} + +# FIXME (kolla review to add ceilometer to swift proxy image) +{% set swift_proxy_server_packages_append = ['openstack-ceilometer-common'] %} + +# Use mariadb-server package +{% set mariadb_packages_remove = ['MariaDB-Galera-server', 'MariaDB-client'] %} +{% set mariadb_packages_append = ['mariadb-server'] %} + +# We'll configure mariadb with galera.cnf +{% block mariadb_footer %} +RUN rm /etc/my.cnf.d/mariadb-server.cnf /etc/my.cnf.d/auth_gssapi.cnf +{% endblock %}