From 87bc72a37cf70a3b1548a4c6614768c2efe8f79c Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Mon, 14 Jan 2019 15:06:34 +0530
Subject: [PATCH] Use net=none for *_init_log(s) containers

It seems we're using the default docker0(docker)/cni0(podman) bridges
for these containers. It would be good to remove dependencies on these
default bridges.

Some other containers changed that have the same issue:
- ironic_inspector_init_dnsmasq_dhcp_hostsdir
- nova_statedir_owner
- swift_setup_srv
- swift_copy_rings
- horizon_fix_perms

Change-Id: Id3e60de7bb5a13e32544bed76e4970d53a9257d4
---
 deployment/aodh/aodh-api-container-puppet.yaml           | 1 +
 deployment/cinder/cinder-api-container-puppet.yaml       | 1 +
 deployment/cinder/cinder-backup-container-puppet.yaml    | 1 +
 deployment/cinder/cinder-backup-pacemaker-puppet.yaml    | 1 +
 deployment/cinder/cinder-scheduler-container-puppet.yaml | 1 +
 deployment/cinder/cinder-volume-container-puppet.yaml    | 1 +
 deployment/cinder/cinder-volume-pacemaker-puppet.yaml    | 1 +
 deployment/glance/glance-api-logging-file-container.yaml | 1 +
 deployment/ironic/ironic-api-container-puppet.yaml       | 1 +
 deployment/ironic/ironic-inspector-container-puppet.yaml | 2 ++
 deployment/zaqar/zaqar-container-puppet.yaml             | 1 +
 docker/services/ceilometer-agent-central.yaml            | 1 +
 docker/services/ceilometer-agent-ipmi.yaml               | 1 +
 docker/services/ceilometer-agent-notification.yaml       | 1 +
 docker/services/congress.yaml                            | 1 +
 docker/services/database/mysql.yaml                      | 1 +
 docker/services/database/redis.yaml                      | 1 +
 docker/services/designate-central.yaml                   | 1 +
 docker/services/ec2-api.yaml                             | 1 +
 docker/services/gnocchi-api.yaml                         | 1 +
 docker/services/horizon.yaml                             | 1 +
 docker/services/logging/files/barbican-api.yaml          | 1 +
 docker/services/logging/files/heat-engine.yaml           | 1 +
 docker/services/logging/files/keystone.yaml              | 1 +
 docker/services/logging/files/neutron-api.yaml           | 1 +
 docker/services/logging/files/nova-api.yaml              | 1 +
 docker/services/logging/files/nova-common.yaml           | 1 +
 docker/services/logging/files/nova-metadata.yaml         | 1 +
 docker/services/logging/files/nova-placement.yaml        | 1 +
 docker/services/logging/files/panko-api.yaml             | 1 +
 docker/services/manila-api.yaml                          | 1 +
 docker/services/messaging/notify-rabbitmq.yaml           | 1 +
 docker/services/messaging/rpc-qdrouterd.yaml             | 1 +
 docker/services/messaging/rpc-rabbitmq.yaml              | 1 +
 docker/services/metrics/qdr.yaml                         | 1 +
 docker/services/mistral-api.yaml                         | 1 +
 docker/services/nova-compute.yaml                        | 1 +
 docker/services/nova-ironic.yaml                         | 1 +
 docker/services/pacemaker/manila-share.yaml              | 1 +
 docker/services/qdrouterd.yaml                           | 1 +
 docker/services/rabbitmq.yaml                            | 1 +
 docker/services/swift-ringbuilder.yaml                   | 1 +
 docker/services/swift-storage.yaml                       | 1 +
 docker/services/tacker.yaml                              | 1 +
 docker/services/tempest.yaml                             | 1 +
 45 files changed, 46 insertions(+)

diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml
index c87271e3e0..de809b10dd 100644
--- a/deployment/aodh/aodh-api-container-puppet.yaml
+++ b/deployment/aodh/aodh-api-container-puppet.yaml
@@ -164,6 +164,7 @@ outputs:
         step_2:
           aodh_init_log:
             image: &aodh_api_image {get_param: DockerAodhApiImage}
+            net: none
             user: root
             volumes:
               - /var/log/containers/aodh:/var/log/aodh:z
diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml
index a5838adc62..1b23a6ce95 100644
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -247,6 +247,7 @@ outputs:
         step_2:
           cinder_api_init_logs:
             image: &cinder_api_image {get_param: DockerCinderApiImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml
index a00d3b366c..f55502da0e 100644
--- a/deployment/cinder/cinder-backup-container-puppet.yaml
+++ b/deployment/cinder/cinder-backup-container-puppet.yaml
@@ -190,6 +190,7 @@ outputs:
           cinder_backup_init_logs:
             start_order: 0
             image: &cinder_backup_image {get_param: DockerCinderBackupImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
index 055249dadf..7fce473416 100644
--- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
@@ -171,6 +171,7 @@ outputs:
           cinder_backup_init_logs:
             start_order: 0
             image: {get_param: DockerCinderBackupImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml
index 64717c7d48..467199f2e3 100644
--- a/deployment/cinder/cinder-scheduler-container-puppet.yaml
+++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml
@@ -112,6 +112,7 @@ outputs:
         step_2:
           cinder_scheduler_init_logs:
             image: &cinder_scheduler_image {get_param: DockerCinderSchedulerImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml
index da67dd3d78..8248551282 100644
--- a/deployment/cinder/cinder-volume-container-puppet.yaml
+++ b/deployment/cinder/cinder-volume-container-puppet.yaml
@@ -286,6 +286,7 @@ outputs:
           cinder_volume_init_logs:
             start_order: 0
             image: &cinder_volume_image {get_param: DockerCinderVolumeImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
index cec84ead25..b994908d62 100644
--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
@@ -155,6 +155,7 @@ outputs:
           cinder_volume_init_logs:
             start_order: 0
             image: {get_param: DockerCinderVolumeImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/deployment/glance/glance-api-logging-file-container.yaml b/deployment/glance/glance-api-logging-file-container.yaml
index 0c9d5f47d5..95d556f4eb 100644
--- a/deployment/glance/glance-api-logging-file-container.yaml
+++ b/deployment/glance/glance-api-logging-file-container.yaml
@@ -23,6 +23,7 @@ outputs:
       step_2:
         glance_init_logs:
           image: {get_param: DockerGlanceApiImage}
+          net: none
           privileged: false
           user: root
           volumes: *glance_api_volumes
diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml
index fd5e150d47..7409e86c27 100644
--- a/deployment/ironic/ironic-api-container-puppet.yaml
+++ b/deployment/ironic/ironic-api-container-puppet.yaml
@@ -206,6 +206,7 @@ outputs:
         step_2:
           ironic_init_logs:
             image: &ironic_api_image {get_param: DockerIronicApiImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml
index 0856d6f3d8..f964b0faa2 100644
--- a/deployment/ironic/ironic-inspector-container-puppet.yaml
+++ b/deployment/ironic/ironic-inspector-container-puppet.yaml
@@ -347,6 +347,7 @@ outputs:
             start_order: 0
             image: &ironic_inspector_image
               get_param: DockerIronicInspectorImage
+            net: none
             user: root
             volumes:
               - /var/log/containers/ironic-inspector:/var/log/ironic-inspector:z
@@ -355,6 +356,7 @@ outputs:
           ironic_inspector_init_dnsmasq_dhcp_hostsdir:
             start_order: 1
             image: *ironic_inspector_image
+            net: none
             user: root
             volumes:
             - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:shared,z
diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml
index 415a255fef..12013a54e0 100644
--- a/deployment/zaqar/zaqar-container-puppet.yaml
+++ b/deployment/zaqar/zaqar-container-puppet.yaml
@@ -280,6 +280,7 @@ outputs:
               step_2:
                 zaqar_init_log:
                   image: &zaqar_image {get_param: DockerZaqarImage}
+                  net: none
                   user: root
                   volumes:
                     - /var/log/containers/zaqar:/var/log/zaqar
diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml
index 3439b96494..ed6fda0bee 100644
--- a/docker/services/ceilometer-agent-central.yaml
+++ b/docker/services/ceilometer-agent-central.yaml
@@ -95,6 +95,7 @@ outputs:
           ceilometer_init_log:
             start_order: 0
             image: &ceilometer_agent_central_image {get_param: DockerCeilometerCentralImage}
+            net: none
             user: root
             command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
             volumes:
diff --git a/docker/services/ceilometer-agent-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml
index 4eec635cdd..71a6c36f92 100644
--- a/docker/services/ceilometer-agent-ipmi.yaml
+++ b/docker/services/ceilometer-agent-ipmi.yaml
@@ -95,6 +95,7 @@ outputs:
           ceilometer_init_log:
             start_order: 0
             image: &ceilometer_agent_ipmi_image {get_param: DockerCeilometerIpmiImage}
+            net: none
             user: root
             command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
             volumes:
diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml
index 8db2e70ea8..88947f51c1 100644
--- a/docker/services/ceilometer-agent-notification.yaml
+++ b/docker/services/ceilometer-agent-notification.yaml
@@ -113,6 +113,7 @@ outputs:
           ceilometer_init_log:
             start_order: 0
             image: &ceilometer_agent_notification_image {get_param: DockerCeilometerNotificationImage}
+            net: none
             user: root
             command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
             volumes:
diff --git a/docker/services/congress.yaml b/docker/services/congress.yaml
index dbcf093403..286890bffd 100644
--- a/docker/services/congress.yaml
+++ b/docker/services/congress.yaml
@@ -95,6 +95,7 @@ outputs:
         step_2:
           congress_init_logs:
             image: &congress_api_image {get_param: DockerCongressApiImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index daf87556f0..698d16ac66 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -124,6 +124,7 @@ outputs:
         step_1:
           mysql_init_logs:
             image: &mysql_image {get_param: DockerMysqlImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml
index e98a531913..373be2a971 100644
--- a/docker/services/database/redis.yaml
+++ b/docker/services/database/redis.yaml
@@ -105,6 +105,7 @@ outputs:
                 start_order: 0
                 detach: false
                 image: &redis_image {get_param: DockerRedisImage}
+                net: none
                 privileged: false
                 user: root
                 volumes:
diff --git a/docker/services/designate-central.yaml b/docker/services/designate-central.yaml
index 3c6aa418ad..646aa5535d 100644
--- a/docker/services/designate-central.yaml
+++ b/docker/services/designate-central.yaml
@@ -104,6 +104,7 @@ outputs:
         step_2:
           designate_init_logs:
             image: &designate_central_image {get_param: DockerDesignateCentralImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml
index 69860a800b..40ed73f81b 100644
--- a/docker/services/ec2-api.yaml
+++ b/docker/services/ec2-api.yaml
@@ -125,6 +125,7 @@ outputs:
         step_2:
           ec2_api_init_logs:
             image: &ec2_api_image {get_param: DockerEc2ApiImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index 0003d156ba..7c987f0630 100644
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@ -154,6 +154,7 @@ outputs:
         step_2:
           gnocchi_init_log:
             image: &gnocchi_api_image {get_param: DockerGnocchiApiImage}
+            net: none
             user: root
             volumes:
               - /var/log/containers/gnocchi:/var/log/gnocchi:z
diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml
index 9041d3547f..09f31e03a3 100644
--- a/docker/services/horizon.yaml
+++ b/docker/services/horizon.yaml
@@ -102,6 +102,7 @@ outputs:
         step_2:
           horizon_fix_perms:
             image: &horizon_image {get_param: DockerHorizonImage}
+            net: none
             user: root
             # NOTE Set ownership for /var/log/horizon/horizon.log file here,
             # otherwise it's created by root when generating django cache.
diff --git a/docker/services/logging/files/barbican-api.yaml b/docker/services/logging/files/barbican-api.yaml
index 8828a0a9dc..094d459a29 100644
--- a/docker/services/logging/files/barbican-api.yaml
+++ b/docker/services/logging/files/barbican-api.yaml
@@ -26,6 +26,7 @@ outputs:
       step_2:
         barbican_init_log:
           image: {get_param: DockerBarbicanApiImage}
+          net: none
           user: root
           volumes: *barbican_api_volumes
           command: ['/bin/bash', '-c', 'chown -R barbican:barbican /var/log/barbican']
diff --git a/docker/services/logging/files/heat-engine.yaml b/docker/services/logging/files/heat-engine.yaml
index d19a25ed3b..8a142c34bf 100644
--- a/docker/services/logging/files/heat-engine.yaml
+++ b/docker/services/logging/files/heat-engine.yaml
@@ -22,6 +22,7 @@ outputs:
       step_2:
         heat_init_log:
           image: {get_param: DockerHeatEngineImage}
+          net: none
           user: root
           volumes:
             - /var/log/containers/heat:/var/log/heat:z
diff --git a/docker/services/logging/files/keystone.yaml b/docker/services/logging/files/keystone.yaml
index fa484d920e..e5371658a0 100644
--- a/docker/services/logging/files/keystone.yaml
+++ b/docker/services/logging/files/keystone.yaml
@@ -24,6 +24,7 @@ outputs:
         keystone_init_log:
           start_order: 1
           image: {get_param: DockerKeystoneImage}
+          net: none
           user: root
           command: ['/bin/bash', '-c', 'chown -R keystone:keystone /var/log/keystone']
           volumes: *keystone_volumes
diff --git a/docker/services/logging/files/neutron-api.yaml b/docker/services/logging/files/neutron-api.yaml
index 85a29cf7d3..0ddc626964 100644
--- a/docker/services/logging/files/neutron-api.yaml
+++ b/docker/services/logging/files/neutron-api.yaml
@@ -34,6 +34,7 @@ outputs:
       step_2:
         neutron_init_logs:
           image: {get_param: DockerNeutronApiImage}
+          net: none
           privileged: false
           user: root
           volumes: *neutron_api_volumes
diff --git a/docker/services/logging/files/nova-api.yaml b/docker/services/logging/files/nova-api.yaml
index a48113a788..4aed2214c1 100644
--- a/docker/services/logging/files/nova-api.yaml
+++ b/docker/services/logging/files/nova-api.yaml
@@ -24,6 +24,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         nova_api_init_logs:
           image: {get_param: DockerNovaApiImage}
+          net: none
           privileged: false
           user: root
           volumes: *nova_api_volumes
diff --git a/docker/services/logging/files/nova-common.yaml b/docker/services/logging/files/nova-common.yaml
index a3cf9456d8..d5ffa9c142 100644
--- a/docker/services/logging/files/nova-common.yaml
+++ b/docker/services/logging/files/nova-common.yaml
@@ -41,6 +41,7 @@ outputs:
         map_replace:
         - CONTAINERNAME:
             image: {get_param: DockerNovaImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/logging/files/nova-metadata.yaml b/docker/services/logging/files/nova-metadata.yaml
index 096fab0417..08364da444 100644
--- a/docker/services/logging/files/nova-metadata.yaml
+++ b/docker/services/logging/files/nova-metadata.yaml
@@ -23,6 +23,7 @@ outputs:
       step_2:
         nova_metadata_init_logs:
           image: {get_param: DockerNovaMetadataImage}
+          net: none
           privileged: false
           user: root
           volumes: *nova_metadata_volumes
diff --git a/docker/services/logging/files/nova-placement.yaml b/docker/services/logging/files/nova-placement.yaml
index b79f1ef188..49030f66c3 100644
--- a/docker/services/logging/files/nova-placement.yaml
+++ b/docker/services/logging/files/nova-placement.yaml
@@ -24,6 +24,7 @@ outputs:
         nova_placement_init_log:
           start_order: 1
           image: {get_param: DockerNovaPlacementImage}
+          net: none
           user: root
           command: ['/bin/bash', '-c', 'chown -R nova:nova /var/log/nova']
           volumes: *nova_placement_volumes
diff --git a/docker/services/logging/files/panko-api.yaml b/docker/services/logging/files/panko-api.yaml
index 3b9a992bd8..66a5ed46fc 100644
--- a/docker/services/logging/files/panko-api.yaml
+++ b/docker/services/logging/files/panko-api.yaml
@@ -26,6 +26,7 @@ outputs:
       step_2:
         panko_init_log:
           image: {get_param: DockerPankoApiImage}
+          net: none
           user: root
           volumes: *panko_api_volumes
           command: ['/bin/bash', '-c', 'chown -R panko:panko /var/log/panko']
diff --git a/docker/services/manila-api.yaml b/docker/services/manila-api.yaml
index 56572e932d..350ad6ccc5 100644
--- a/docker/services/manila-api.yaml
+++ b/docker/services/manila-api.yaml
@@ -86,6 +86,7 @@ outputs:
         step_2:
           manila_init_logs:
             image: &manila_api_image {get_param: DockerManilaApiImage}
+            net: none
             user: root
             volumes:
               - /var/log/containers/manila:/var/log/manila:z
diff --git a/docker/services/messaging/notify-rabbitmq.yaml b/docker/services/messaging/notify-rabbitmq.yaml
index fd82035b79..368fdb870d 100644
--- a/docker/services/messaging/notify-rabbitmq.yaml
+++ b/docker/services/messaging/notify-rabbitmq.yaml
@@ -123,6 +123,7 @@ outputs:
             start_order: 0
             detach: false
             image: &rabbitmq_image {get_param: DockerRabbitmqImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/messaging/rpc-qdrouterd.yaml b/docker/services/messaging/rpc-qdrouterd.yaml
index 402ec6e346..3f47ca63df 100644
--- a/docker/services/messaging/rpc-qdrouterd.yaml
+++ b/docker/services/messaging/rpc-qdrouterd.yaml
@@ -92,6 +92,7 @@ outputs:
             start_order: 0
             detach: false
             image: &qdrouterd_image {get_param: DockerQdrouterdImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/messaging/rpc-rabbitmq.yaml b/docker/services/messaging/rpc-rabbitmq.yaml
index a5ec8898dd..b144655829 100644
--- a/docker/services/messaging/rpc-rabbitmq.yaml
+++ b/docker/services/messaging/rpc-rabbitmq.yaml
@@ -123,6 +123,7 @@ outputs:
             start_order: 0
             detach: false
             image: &rabbitmq_image {get_param: DockerRabbitmqImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/metrics/qdr.yaml b/docker/services/metrics/qdr.yaml
index f9b1fedf54..e0f2d42e77 100644
--- a/docker/services/metrics/qdr.yaml
+++ b/docker/services/metrics/qdr.yaml
@@ -183,6 +183,7 @@ outputs:
             start_order: 0
             detach: false
             image: &qdrouterd_image {get_param: DockerMetricsQdrImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml
index b0a79c0942..a8d3555560 100644
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@@ -95,6 +95,7 @@ outputs:
         step_2:
           mistral_init_logs:
             image: &mistral_api_image {get_param: DockerMistralApiImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index cf36dd5f5f..e575ca8f6b 100644
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@ -183,6 +183,7 @@ outputs:
         step_3:
           nova_statedir_owner:
             image: &nova_compute_image {get_param: DockerNovaComputeImage}
+            net: none
             user: root
             privileged: false
             detach: false
diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 2b4124a7a1..8a1c230cd4 100644
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -108,6 +108,7 @@ outputs:
         step_3:
           nova_statedir_owner:
             image: &nova_ironic_image {get_param: DockerNovaComputeIronicImage}
+            net: none
             user: root
             privileged: false
             detach: false
diff --git a/docker/services/pacemaker/manila-share.yaml b/docker/services/pacemaker/manila-share.yaml
index bf7f9ecb9e..6b8841c91b 100644
--- a/docker/services/pacemaker/manila-share.yaml
+++ b/docker/services/pacemaker/manila-share.yaml
@@ -136,6 +136,7 @@ outputs:
           manila_share_init_logs:
             start_order: 0
             image: {get_param: DockerManilaShareImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/qdrouterd.yaml b/docker/services/qdrouterd.yaml
index bac1ae81e9..ed070ab37e 100644
--- a/docker/services/qdrouterd.yaml
+++ b/docker/services/qdrouterd.yaml
@@ -84,6 +84,7 @@ outputs:
             start_order: 0
             detach: false
             image: &qdrouterd_image {get_param: DockerQdrouterdImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index 3f27a0299b..47e0d97bdd 100644
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@@ -122,6 +122,7 @@ outputs:
             start_order: 0
             detach: false
             image: &rabbitmq_image {get_param: DockerRabbitmqImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml
index 47a9c7032c..4a3ef13ed7 100644
--- a/docker/services/swift-ringbuilder.yaml
+++ b/docker/services/swift-ringbuilder.yaml
@@ -104,6 +104,7 @@ outputs:
         step_3:
           swift_copy_rings:
             image: *swift_ringbuilder_image
+            net: none
             user: root
             detach: false
             command:
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index 57be265367..72e23d3581 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -224,6 +224,7 @@ outputs:
           # directory and make sure it's owned by swift.
           swift_setup_srv:
             image: &swift_account_image {get_param: DockerSwiftAccountImage}
+            net: none
             user: root
             command: ['chown', '-R', 'swift:', '/srv/node']
             volumes:
diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml
index 6f3887cda0..f8b98dacd6 100644
--- a/docker/services/tacker.yaml
+++ b/docker/services/tacker.yaml
@@ -91,6 +91,7 @@ outputs:
         step_2:
           tacker_init_logs:
             image: &tacker_image {get_param: DockerTackerImage}
+            net: none
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/tempest.yaml b/docker/services/tempest.yaml
index b5b316262d..3d15b084fb 100644
--- a/docker/services/tempest.yaml
+++ b/docker/services/tempest.yaml
@@ -49,6 +49,7 @@ outputs:
         step_2:
           tempest_init_logs:
             image: &tempest_image {get_param: DockerTempestImage}
+            net: none
             privileged: false
             user: root
             volumes: