From 59d8abbd5881415c15cd4c22d8e5696a69eabe4d Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Mon, 18 Jan 2021 11:31:44 +0100
Subject: openstack-base: move some packages from child images

automaton: cinder, glance, ironic, magnum, masakari, nova, octavia,
           watcher

castellan: barbican, cinder, cyborg, glance, horizon, mistral, murano,
           nova, octavia, sahara, tacker

click: blazar, cloudkitty, designate, ironic, keystone, kuryr, monasca,
       octavia, rally, sahara, zun

httplib2: cinder, glance, horizon, monasca, neutron, solum, tacker,
          trove

os-brick: cinder, freezer, glance, nova, zun

os-traits: heat, ironic, kuryr, neutron, nova, octavia, placement,
           tacker, tempest, zun

os-win: cinder, designate, freezer, glance, neutron, nova, zun

oslo.privsep: ceilometer, cinder, cyborg, freezer, glance, masakari,
              neutron, nova, solum, tacker, zun

oslo.reports: ceilometer, cinder, designate, glance, heat, magnum,
              manila, mistral, neutron, nova, octavia, panko, senlin,
              tacker, watcher, zaqar

oslo.rootwrap: ceilometer, cinder, designate, glance, ironic, manila,
               neutron, nova, sahara, solum, tacker, zun

oslo.upgradecheck: aodh, barbican, blazar, ceilometer, cinder,
                   cloudkitty, cyborg, designate, freezer, glance, heat,
                   horizon, ironic, keystone, kuryr, magnum, manila,
                   masakari, mistral, monasca, murano, neutron, nova,
                   octavia, placement, sahara, senlin, solum, tacker,
                   trove, vitrage, watcher, zaqar, zun

oslo.versionedobjects: barbican, cinder, cyborg, designate, heat,
                       ironic, kuryr, magnum, masakari, mistral,
                       neutron, nova, octavia, senlin, tacker, tempest,
                       watcher, zun

paramiko: ceilometer, cinder, freezer, manila, mistral, neutron, nova,
          rally, sahara, tacker, tempest, vmtp

Change-Id: Ibb1e20a959a09f446752dbf1a54fb93df0892681
---
 docker/openstack-base/Dockerfile.j2 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index fdaf9107e..1e8402e4c 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -216,8 +216,11 @@ ENV DEBIAN_FRONTEND noninteractive
         'anyjson',
         'aodhclient',
         'appdirs',
+        'automaton',
         'bcrypt',
         'cachetools',
+        'castellan',
+        'click',
         'cliff',
         'cmd2',
         'cryptography',
@@ -231,6 +234,7 @@ ENV DEBIAN_FRONTEND noninteractive
         'futurist',
         'gnocchiclient',
         'greenlet',
+        'httplib2',
         'iso8601',
         'jinja2',
         'jsonpatch',
@@ -245,6 +249,9 @@ ENV DEBIAN_FRONTEND noninteractive
         'netaddr',
         'netifaces',
         'os-client-config',
+        'os-brick',
+        'os-traits',
+        'os-win',
         'oslo.concurrency',
         'oslo.config',
         'oslo.context',
@@ -254,11 +261,17 @@ ENV DEBIAN_FRONTEND noninteractive
         'oslo.messaging',
         'oslo.middleware',
         'oslo.policy',
+        'oslo.privsep',
+        'oslo.reports',
+        'oslo.rootwrap',
         'oslo.serialization',
         'oslo.service',
+        'oslo.upgradecheck',
         'oslo.utils',
+        'oslo.versionedobjects',
         'oslo.vmware',
         'osprofiler',
+        'paramiko',
         'pbr',
         'pecan',
         'pika',
-- 
cgit v1.2.3