From 453bad6c77fd4d6c93262b1030fc104270e2f2b1 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Tue, 17 Sep 2019 03:14:00 +0000 Subject: [PATCH] mistral-executor image install novajoin package This is required in a nova-less scenario where the provision workflow needs to include the novajoin cloud-init script in the config_drive data so that the provisioned node can be registered with FreeIPA. Change-Id: Ie57ab22b72b172985a3fff02bb4d8915c9df4152 Blueprint: nova-less-deploy --- container-images/tripleo_kolla_template_overrides.j2 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index 9b4e840cd..72dbd8e83 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -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',