openstack/tripleo-common
Code Issues Proposed changes

Merge "Move python-novajoin package to nova-compute-ironic"

Browse Source
This commit is contained in:
Zuul
2018-08-17 18:44:01 +00:00
committed by Gerrit Code Review
parent f4fa4ee94d 7cf28ce37d
commit 9f8de34eeb
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
container-images/tripleo_kolla_template_overrides.j2
View File

@@ -30,10 +30,11 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
# 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'] %}
# This installs the novajoin package in the nova_api container image; This is
# 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
# provided by the novajoin package in order to enroll the nodes to the CA
{% set nova_api_packages_append = ['python-novajoin'] %}
{% set nova_compute_ironic_packages_append = ['python-novajoin'] %}
{% set nova_scheduler_packages_append = ['openstack-tripleo-common'] %}
@@ -139,8 +140,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
'openstack-trove-ui'
] %}
# Required for nova migration & TLS everywhere
{% set nova_compute_packages_append = ['openstack-nova-migration', 'openssh-server', 'python-novajoin'] %}
# Required for nova migration
{% set nova_compute_packages_append = ['openstack-nova-migration', 'openssh-server'] %}
{% set nova_libvirt_packages_append = ['openstack-nova-migration'] %}
############################ service container footers #########################