Merge "nova-migration-target: Simplify port configuration"

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: "/"