From 6d565e1d829a230bb97d0eac0b8b621da10fb343 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 30 Oct 2018 17:32:53 -0600 Subject: [PATCH] Move some container deps out of base The ansible, python-shade, python-kubernetes packages account for a significant about of space on the base image but are not currently required for all images. Here are the top space hogs out of the base container: selinux-policy-minimum 15529233 python2-kubernetes 18007990 selinux-policy-targeted 19280401 python2-babel 20806893 systemd 24402038 python-libs 24713084 binutils 25149789 ansible 47814651 glibc-common 120325207 This change moves ansible and python-shade to the mistral base container as we execute ansible via mistral. The openstack-selinux dependency is moved out of the base container to the openstack-base container as it makes more sense there. Change-Id: I7405d8b9ea8bb7f93696635f1947470f37cdeff4 --- container-images/tripleo_kolla_template_overrides.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index d22957c1e..22babbf3d 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -32,7 +32,7 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo # This installs the puppet dependency in the base container and includes helper scripts # Rsync is required for docker-puppet.py to move the generated config to /var/lib/config-data # Cron is required by multiple services -{% set base_centos_binary_packages_append = ['openstack-tripleo-common-container-base', 'rsync', 'cronie', 'crudini', 'openstack-selinux', 'ansible', 'python-shade', 'puppet-tripleo', 'python2-kubernetes'] %} +{% set base_centos_binary_packages_append = ['openstack-tripleo-common-container-base', 'rsync', 'cronie', 'crudini', 'puppet-tripleo'] %} # This installs the novajoin package in the nova container images; This is # required for TLS everywhere, as nova-api will use the cloud-init script @@ -44,7 +44,7 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo # Required for mistral-db-populate to load tripleo custom actions on # the undercloud -{% set mistral_base_packages_append = ['openstack-tripleo-common', 'skydive-ansible'] %} +{% set mistral_base_packages_append = ['openstack-tripleo-common', 'ansible', 'python-shade', 'skydive-ansible'] %} # NOTE: Mistral executor needs: # openstack-tripleo-validations: validations @@ -121,7 +121,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 'python-vitrageclient', ] %} # Pick up the proper packages for python2-crypto and python2-msgpack -{% set openstack_base_packages_append = ['python-crypto', 'python-msgpack'] %} +{% set openstack_base_packages_append = ['python-crypto', 'python-msgpack', 'openstack-selinux'] %} # Use mariadb-server-galera and xinetd for galera and clustercheck {# 'percona-xtrabackup', # EPEL