openstack/tripleo-common
Code Issues Proposed changes

Remove tripleo ironic-staging-drivers addition

Browse Source 
This has been included in kolla proper so we no longer need to add this
in the tripleo kolla overrides.

Change-Id: Ia1ed2fbeca711d4641eced0a2b19278a7f676cdf
This commit is contained in:
Alex Schultz 2018-12-10 15:27:29 -07:00
parent 9f1163fab8
commit 7ab5342d9f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
container-images/tripleo_kolla_template_overrides.j2
View File

@ -56,9 +56,6 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
# python-notario: ceph-ansible depends on this but it is bind mounted from host
{% set mistral_executor_packages_append = ['openstack-tripleo-validations', 'openstack-nova-common', 'docker', 'podman', 'libseccomp', 'openstack-tripleo-heat-templates', 'python2-notario'] %}
# Include the ironic-staging-drivers
{% set ironic_conductor_packages_append = ['openstack-ironic-staging-drivers'] %}
# FIXME (kolla review to add ceilometer to swift proxy image)
# NOTE (jaosorior): swift proxy with TLS everywhere needs these packages.
# NOTE(mandre) Apache cleanup done below in swift_proxy_server_footer block

6
releasenotes/notes/remove-ironic-staging-drivers-override-ce9776ec030ec02a.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Remove the tripleo specific inclusion of the openstack-ironic-statging-drivers
package into the ironic-conductor container as this has been included in
kolla.