From 87d339972d0bb7bce04e2b921379bf490cb1a2a1 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Thu, 14 Dec 2017 11:29:21 +0100 Subject: [PATCH] Add puppet-tripleo & python2-kubernetes Thinking ahead to a kubernetes based deployment, it would be great to have these 2 packages in the base image for a couple of reasons: 1) We can create k8s jobs to run puppet apply and, while it is good and possible to mount the puppet modules on development environments, it is not as convenient for production. 2) There are a couple of ansible modules and custom scripts that we will run from the images: Uploading generated config files to config maps, managing resources from PODs, etc. and we'll need the kubernetes module for that. Eventually, we will also need python-openshift, which is not in the repos we have enabled right now. When the time comes, I'll propose a patch to add it. Change-Id: I61e35d8118c1de4c2976f496e8a6c9c529f3d91f --- container-images/tripleo_kolla_template_overrides.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index b27c29f73..35bb684b9 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -28,7 +28,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'] %} +{% set base_centos_binary_packages_append = ['openstack-tripleo-common-container-base', 'rsync', 'cronie', 'crudini', 'openstack-selinux', 'ansible', 'python-shade', 'puppet-tripleo', 'python2-kubernetes'] %} {% set nova_scheduler_packages_append = ['openstack-tripleo-common'] %} # Required for mistral-db-populate to load tripleo custom actions on