openstack
/
tripleo-common
Code Issues Proposed changes

Merge "mistral-executor image install novajoin package"

This commit is contained in:
Zuul 2019-09-20 01:52:08 +00:00 committed by Gerrit Code Review
parent 8ced750355 453bad6c77
commit 4d3cd050ec
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
container-images/tripleo_kolla_template_overrides.j2
View File

@ -50,15 +50,18 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
{% block dumb_init_installation %}{% endblock %}
{% set base_centos_binary_packages_append = base_centos_binary_packages_append + ['dumb-init'] %}
# 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
# This installs the novajoin package in the nova/mistral container images; This
# is required for TLS everywhere, as config_drive will contain the cloud-init
# script provided by the novajoin package in order to enroll the nodes to the
# CA
{% if distro_python_version.startswith('3') %}
{% set nova_api_packages_append = ['python3-novajoin'] %}
{% set nova_compute_ironic_packages_append = ['python3-novajoin'] %}
{% set mistral_executor_packages_append = ['python3-novajoin'] %}
{% else %}
{% set nova_api_packages_append = ['python-novajoin'] %}
{% set nova_compute_ironic_packages_append = ['python-novajoin'] %}
{% set mistral_executor_packages_append = ['python-novajoin'] %}
{% endif %}
{% set nova_scheduler_packages_append = ['openstack-tripleo-common'] %}
@ -84,7 +87,7 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
# tripleo-heat-templates: to load the default plan from the CLI/UI
# ipmitool: for baremetal node discovery
# qemu-img: convert Octavia amphora qcow2 to raw
{% set mistral_executor_packages_append = [
{% set mistral_executor_packages_append = mistral_executor_packages_append + [
'openstack-tripleo-validations',
'openstack-nova-common',
'openstack-tripleo-heat-templates',