From 7ab5342d9fce863bb4800d6a2631fe934c7cc34f Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Mon, 10 Dec 2018 15:27:29 -0700
Subject: [PATCH] Remove tripleo ironic-staging-drivers addition
This has been included in kolla proper so we no longer need to add this
in the tripleo kolla overrides.
Change-Id: Ia1ed2fbeca711d4641eced0a2b19278a7f676cdf
---
container-images/tripleo_kolla_template_overrides.j2 | 3 ---
...ve-ironic-staging-drivers-override-ce9776ec030ec02a.yaml | 6 ++++++
2 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 releasenotes/notes/remove-ironic-staging-drivers-override-ce9776ec030ec02a.yaml
diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2
index a6ffca585..2a1dcc2e5 100644
--- a/container-images/tripleo_kolla_template_overrides.j2
+++ b/container-images/tripleo_kolla_template_overrides.j2
@@ -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
diff --git a/releasenotes/notes/remove-ironic-staging-drivers-override-ce9776ec030ec02a.yaml b/releasenotes/notes/remove-ironic-staging-drivers-override-ce9776ec030ec02a.yaml
new file mode 100644
index 000000000..0fda4b4cb
--- /dev/null
+++ b/releasenotes/notes/remove-ironic-staging-drivers-override-ce9776ec030ec02a.yaml
@@ -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.