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
This commit is contained in:
Rabi Mishra 2019-01-14 15:06:34 +05:30
parent 9b284e74cb
commit 87bc72a37c
45 changed files with 46 additions and 0 deletions

View File

@ -164,6 +164,7 @@ outputs:
step_2: step_2:
aodh_init_log: aodh_init_log:
image: &aodh_api_image {get_param: DockerAodhApiImage} image: &aodh_api_image {get_param: DockerAodhApiImage}
net: none
user: root user: root
volumes: volumes:
- /var/log/containers/aodh:/var/log/aodh:z - /var/log/containers/aodh:/var/log/aodh:z

View File

@ -247,6 +247,7 @@ outputs:
step_2: step_2:
cinder_api_init_logs: cinder_api_init_logs:
image: &cinder_api_image {get_param: DockerCinderApiImage} image: &cinder_api_image {get_param: DockerCinderApiImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -190,6 +190,7 @@ outputs:
cinder_backup_init_logs: cinder_backup_init_logs:
start_order: 0 start_order: 0
image: &cinder_backup_image {get_param: DockerCinderBackupImage} image: &cinder_backup_image {get_param: DockerCinderBackupImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -171,6 +171,7 @@ outputs:
cinder_backup_init_logs: cinder_backup_init_logs:
start_order: 0 start_order: 0
image: {get_param: DockerCinderBackupImage} image: {get_param: DockerCinderBackupImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -112,6 +112,7 @@ outputs:
step_2: step_2:
cinder_scheduler_init_logs: cinder_scheduler_init_logs:
image: &cinder_scheduler_image {get_param: DockerCinderSchedulerImage} image: &cinder_scheduler_image {get_param: DockerCinderSchedulerImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -286,6 +286,7 @@ outputs:
cinder_volume_init_logs: cinder_volume_init_logs:
start_order: 0 start_order: 0
image: &cinder_volume_image {get_param: DockerCinderVolumeImage} image: &cinder_volume_image {get_param: DockerCinderVolumeImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -155,6 +155,7 @@ outputs:
cinder_volume_init_logs: cinder_volume_init_logs:
start_order: 0 start_order: 0
image: {get_param: DockerCinderVolumeImage} image: {get_param: DockerCinderVolumeImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -23,6 +23,7 @@ outputs:
step_2: step_2:
glance_init_logs: glance_init_logs:
image: {get_param: DockerGlanceApiImage} image: {get_param: DockerGlanceApiImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: *glance_api_volumes volumes: *glance_api_volumes

View File

@ -206,6 +206,7 @@ outputs:
step_2: step_2:
ironic_init_logs: ironic_init_logs:
image: &ironic_api_image {get_param: DockerIronicApiImage} image: &ironic_api_image {get_param: DockerIronicApiImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -347,6 +347,7 @@ outputs:
start_order: 0 start_order: 0
image: &ironic_inspector_image image: &ironic_inspector_image
get_param: DockerIronicInspectorImage get_param: DockerIronicInspectorImage
net: none
user: root user: root
volumes: volumes:
- /var/log/containers/ironic-inspector:/var/log/ironic-inspector:z - /var/log/containers/ironic-inspector:/var/log/ironic-inspector:z
@ -355,6 +356,7 @@ outputs:
ironic_inspector_init_dnsmasq_dhcp_hostsdir: ironic_inspector_init_dnsmasq_dhcp_hostsdir:
start_order: 1 start_order: 1
image: *ironic_inspector_image image: *ironic_inspector_image
net: none
user: root user: root
volumes: volumes:
- /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:shared,z - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:shared,z

View File

@ -280,6 +280,7 @@ outputs:
step_2: step_2:
zaqar_init_log: zaqar_init_log:
image: &zaqar_image {get_param: DockerZaqarImage} image: &zaqar_image {get_param: DockerZaqarImage}
net: none
user: root user: root
volumes: volumes:
- /var/log/containers/zaqar:/var/log/zaqar - /var/log/containers/zaqar:/var/log/zaqar

View File

@ -95,6 +95,7 @@ outputs:
ceilometer_init_log: ceilometer_init_log:
start_order: 0 start_order: 0
image: &ceilometer_agent_central_image {get_param: DockerCeilometerCentralImage} image: &ceilometer_agent_central_image {get_param: DockerCeilometerCentralImage}
net: none
user: root user: root
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer'] command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
volumes: volumes:

View File

@ -95,6 +95,7 @@ outputs:
ceilometer_init_log: ceilometer_init_log:
start_order: 0 start_order: 0
image: &ceilometer_agent_ipmi_image {get_param: DockerCeilometerIpmiImage} image: &ceilometer_agent_ipmi_image {get_param: DockerCeilometerIpmiImage}
net: none
user: root user: root
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer'] command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
volumes: volumes:

View File

@ -113,6 +113,7 @@ outputs:
ceilometer_init_log: ceilometer_init_log:
start_order: 0 start_order: 0
image: &ceilometer_agent_notification_image {get_param: DockerCeilometerNotificationImage} image: &ceilometer_agent_notification_image {get_param: DockerCeilometerNotificationImage}
net: none
user: root user: root
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer'] command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
volumes: volumes:

View File

@ -95,6 +95,7 @@ outputs:
step_2: step_2:
congress_init_logs: congress_init_logs:
image: &congress_api_image {get_param: DockerCongressApiImage} image: &congress_api_image {get_param: DockerCongressApiImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -124,6 +124,7 @@ outputs:
step_1: step_1:
mysql_init_logs: mysql_init_logs:
image: &mysql_image {get_param: DockerMysqlImage} image: &mysql_image {get_param: DockerMysqlImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -105,6 +105,7 @@ outputs:
start_order: 0 start_order: 0
detach: false detach: false
image: &redis_image {get_param: DockerRedisImage} image: &redis_image {get_param: DockerRedisImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -104,6 +104,7 @@ outputs:
step_2: step_2:
designate_init_logs: designate_init_logs:
image: &designate_central_image {get_param: DockerDesignateCentralImage} image: &designate_central_image {get_param: DockerDesignateCentralImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -125,6 +125,7 @@ outputs:
step_2: step_2:
ec2_api_init_logs: ec2_api_init_logs:
image: &ec2_api_image {get_param: DockerEc2ApiImage} image: &ec2_api_image {get_param: DockerEc2ApiImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -154,6 +154,7 @@ outputs:
step_2: step_2:
gnocchi_init_log: gnocchi_init_log:
image: &gnocchi_api_image {get_param: DockerGnocchiApiImage} image: &gnocchi_api_image {get_param: DockerGnocchiApiImage}
net: none
user: root user: root
volumes: volumes:
- /var/log/containers/gnocchi:/var/log/gnocchi:z - /var/log/containers/gnocchi:/var/log/gnocchi:z

View File

@ -102,6 +102,7 @@ outputs:
step_2: step_2:
horizon_fix_perms: horizon_fix_perms:
image: &horizon_image {get_param: DockerHorizonImage} image: &horizon_image {get_param: DockerHorizonImage}
net: none
user: root user: root
# NOTE Set ownership for /var/log/horizon/horizon.log file here, # NOTE Set ownership for /var/log/horizon/horizon.log file here,
# otherwise it's created by root when generating django cache. # otherwise it's created by root when generating django cache.

View File

@ -26,6 +26,7 @@ outputs:
step_2: step_2:
barbican_init_log: barbican_init_log:
image: {get_param: DockerBarbicanApiImage} image: {get_param: DockerBarbicanApiImage}
net: none
user: root user: root
volumes: *barbican_api_volumes volumes: *barbican_api_volumes
command: ['/bin/bash', '-c', 'chown -R barbican:barbican /var/log/barbican'] command: ['/bin/bash', '-c', 'chown -R barbican:barbican /var/log/barbican']

View File

@ -22,6 +22,7 @@ outputs:
step_2: step_2:
heat_init_log: heat_init_log:
image: {get_param: DockerHeatEngineImage} image: {get_param: DockerHeatEngineImage}
net: none
user: root user: root
volumes: volumes:
- /var/log/containers/heat:/var/log/heat:z - /var/log/containers/heat:/var/log/heat:z

View File

@ -24,6 +24,7 @@ outputs:
keystone_init_log: keystone_init_log:
start_order: 1 start_order: 1
image: {get_param: DockerKeystoneImage} image: {get_param: DockerKeystoneImage}
net: none
user: root user: root
command: ['/bin/bash', '-c', 'chown -R keystone:keystone /var/log/keystone'] command: ['/bin/bash', '-c', 'chown -R keystone:keystone /var/log/keystone']
volumes: *keystone_volumes volumes: *keystone_volumes

View File

@ -34,6 +34,7 @@ outputs:
step_2: step_2:
neutron_init_logs: neutron_init_logs:
image: {get_param: DockerNeutronApiImage} image: {get_param: DockerNeutronApiImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: *neutron_api_volumes volumes: *neutron_api_volumes

View File

@ -24,6 +24,7 @@ outputs:
# db sync runs before permissions set by kolla_config # db sync runs before permissions set by kolla_config
nova_api_init_logs: nova_api_init_logs:
image: {get_param: DockerNovaApiImage} image: {get_param: DockerNovaApiImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: *nova_api_volumes volumes: *nova_api_volumes

View File

@ -41,6 +41,7 @@ outputs:
map_replace: map_replace:
- CONTAINERNAME: - CONTAINERNAME:
image: {get_param: DockerNovaImage} image: {get_param: DockerNovaImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -23,6 +23,7 @@ outputs:
step_2: step_2:
nova_metadata_init_logs: nova_metadata_init_logs:
image: {get_param: DockerNovaMetadataImage} image: {get_param: DockerNovaMetadataImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: *nova_metadata_volumes volumes: *nova_metadata_volumes

View File

@ -24,6 +24,7 @@ outputs:
nova_placement_init_log: nova_placement_init_log:
start_order: 1 start_order: 1
image: {get_param: DockerNovaPlacementImage} image: {get_param: DockerNovaPlacementImage}
net: none
user: root user: root
command: ['/bin/bash', '-c', 'chown -R nova:nova /var/log/nova'] command: ['/bin/bash', '-c', 'chown -R nova:nova /var/log/nova']
volumes: *nova_placement_volumes volumes: *nova_placement_volumes

View File

@ -26,6 +26,7 @@ outputs:
step_2: step_2:
panko_init_log: panko_init_log:
image: {get_param: DockerPankoApiImage} image: {get_param: DockerPankoApiImage}
net: none
user: root user: root
volumes: *panko_api_volumes volumes: *panko_api_volumes
command: ['/bin/bash', '-c', 'chown -R panko:panko /var/log/panko'] command: ['/bin/bash', '-c', 'chown -R panko:panko /var/log/panko']

View File

@ -86,6 +86,7 @@ outputs:
step_2: step_2:
manila_init_logs: manila_init_logs:
image: &manila_api_image {get_param: DockerManilaApiImage} image: &manila_api_image {get_param: DockerManilaApiImage}
net: none
user: root user: root
volumes: volumes:
- /var/log/containers/manila:/var/log/manila:z - /var/log/containers/manila:/var/log/manila:z

View File

@ -123,6 +123,7 @@ outputs:
start_order: 0 start_order: 0
detach: false detach: false
image: &rabbitmq_image {get_param: DockerRabbitmqImage} image: &rabbitmq_image {get_param: DockerRabbitmqImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -92,6 +92,7 @@ outputs:
start_order: 0 start_order: 0
detach: false detach: false
image: &qdrouterd_image {get_param: DockerQdrouterdImage} image: &qdrouterd_image {get_param: DockerQdrouterdImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -123,6 +123,7 @@ outputs:
start_order: 0 start_order: 0
detach: false detach: false
image: &rabbitmq_image {get_param: DockerRabbitmqImage} image: &rabbitmq_image {get_param: DockerRabbitmqImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -183,6 +183,7 @@ outputs:
start_order: 0 start_order: 0
detach: false detach: false
image: &qdrouterd_image {get_param: DockerMetricsQdrImage} image: &qdrouterd_image {get_param: DockerMetricsQdrImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -95,6 +95,7 @@ outputs:
step_2: step_2:
mistral_init_logs: mistral_init_logs:
image: &mistral_api_image {get_param: DockerMistralApiImage} image: &mistral_api_image {get_param: DockerMistralApiImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -183,6 +183,7 @@ outputs:
step_3: step_3:
nova_statedir_owner: nova_statedir_owner:
image: &nova_compute_image {get_param: DockerNovaComputeImage} image: &nova_compute_image {get_param: DockerNovaComputeImage}
net: none
user: root user: root
privileged: false privileged: false
detach: false detach: false

View File

@ -108,6 +108,7 @@ outputs:
step_3: step_3:
nova_statedir_owner: nova_statedir_owner:
image: &nova_ironic_image {get_param: DockerNovaComputeIronicImage} image: &nova_ironic_image {get_param: DockerNovaComputeIronicImage}
net: none
user: root user: root
privileged: false privileged: false
detach: false detach: false

View File

@ -136,6 +136,7 @@ outputs:
manila_share_init_logs: manila_share_init_logs:
start_order: 0 start_order: 0
image: {get_param: DockerManilaShareImage} image: {get_param: DockerManilaShareImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -84,6 +84,7 @@ outputs:
start_order: 0 start_order: 0
detach: false detach: false
image: &qdrouterd_image {get_param: DockerQdrouterdImage} image: &qdrouterd_image {get_param: DockerQdrouterdImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -122,6 +122,7 @@ outputs:
start_order: 0 start_order: 0
detach: false detach: false
image: &rabbitmq_image {get_param: DockerRabbitmqImage} image: &rabbitmq_image {get_param: DockerRabbitmqImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -104,6 +104,7 @@ outputs:
step_3: step_3:
swift_copy_rings: swift_copy_rings:
image: *swift_ringbuilder_image image: *swift_ringbuilder_image
net: none
user: root user: root
detach: false detach: false
command: command:

View File

@ -224,6 +224,7 @@ outputs:
# directory and make sure it's owned by swift. # directory and make sure it's owned by swift.
swift_setup_srv: swift_setup_srv:
image: &swift_account_image {get_param: DockerSwiftAccountImage} image: &swift_account_image {get_param: DockerSwiftAccountImage}
net: none
user: root user: root
command: ['chown', '-R', 'swift:', '/srv/node'] command: ['chown', '-R', 'swift:', '/srv/node']
volumes: volumes:

View File

@ -91,6 +91,7 @@ outputs:
step_2: step_2:
tacker_init_logs: tacker_init_logs:
image: &tacker_image {get_param: DockerTackerImage} image: &tacker_image {get_param: DockerTackerImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes:

View File

@ -49,6 +49,7 @@ outputs:
step_2: step_2:
tempest_init_logs: tempest_init_logs:
image: &tempest_image {get_param: DockerTempestImage} image: &tempest_image {get_param: DockerTempestImage}
net: none
privileged: false privileged: false
user: root user: root
volumes: volumes: