From 5b1ba9846b68545751b930c7c4a65e97845d2e3d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 30 May 2019 08:09:27 +0900 Subject: [PATCH] Do not bind /run on host to nova_migration_target Now we have 2 sshd instances running on compute nodes, (1)sshd running on host, and (2)sshd running inside nova_migration_target. Because we bind /run on host to nova_mgiration_target, these two prcesses share the same pid file, /var/run/sshd.pid , which causes that we have pid 1 in that pid file. As we do not require sshd running on the container to have access to host pid files, this patch removes bind about /run about the container, to avoid the overwriting problem. Change-Id: I71cb64997991a31b1b87bf73aa4109c355a90708 Closes-bug: #1830982 (cherry picked from commit b4223ead2d1ed7e07cdfd5ceac52f43eb29e0f71) --- deployment/nova/nova-migration-target-container-puppet.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml index f109872937..a0c6782281 100644 --- a/deployment/nova/nova-migration-target-container-puppet.yaml +++ b/deployment/nova/nova-migration-target-container-puppet.yaml @@ -147,7 +147,6 @@ outputs: - /var/lib/kolla/config_files/nova-migration-target.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro - /etc/ssh/:/host-ssh/:ro - - /run:/run - /var/lib/nova:/var/lib/nova:shared environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS