From 9168ffa82ddd25183e98df41f496442ae3430704 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 7 Jun 2022 13:51:48 +0900
Subject: [PATCH] nova-migration-target: Simplify port configuration

This change replaces usage of -p command line option by the listen
option in sshd_config. Now the nova migration target is decoupled from
the host sshd service so we can use the ssh::* parameters to customize
only the target service.

Change-Id: I53fb0229babe46c30b8ffe6b02caa43ad5294d68
---
 .../nova-migration-target-container-puppet.yaml   | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml
index beb0282dbb..ebf6301e90 100644
--- a/deployment/nova/nova-migration-target-container-puppet.yaml
+++ b/deployment/nova/nova-migration-target-container-puppet.yaml
@@ -138,7 +138,10 @@ outputs:
               params:
                 $NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
         tripleo::profile::base::sshd::port:
-          - 22
+          - if:
+            - docker_nova_migration_ssh_port_set
+            - {get_param: DockerNovaMigrationSshdPort}
+            - {get_param: MigrationSshPort}
         tripleo::profile::base::sshd::password_authentication: 'no'
         tripleo::profile::base::sshd::options:
           HostKey:
@@ -170,15 +173,7 @@ outputs:
         config_image: {get_attr: [RoleParametersValue, value, ContainerNovaLibvirtConfigImage]}
       kolla_config:
         /var/lib/kolla/config_files/nova-migration-target.json:
-          command:
-            str_replace:
-              template: "/usr/sbin/sshd -D -p SSHDPORT"
-              params:
-                SSHDPORT:
-                  if:
-                    - docker_nova_migration_ssh_port_set
-                    - {get_param: DockerNovaMigrationSshdPort}
-                    - {get_param: MigrationSshPort}
+          command: "/usr/sbin/sshd -D"
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"