diff options
| author |   Oliver Walsh <owalsh@redhat.com> | 2017-09-06 11:19:48 +0100 |
|---|---|---|
| committer | Oliver Walsh <owalsh@redhat.com> | 2017-09-20 11:51:17 +0100 |
| commit | 68c6f280b1ca77f9c01dac257e0a603f51809eb7 (patch) | |
| tree | f802f15fb4404441b90e9c5002d4222971c416dd /manifests/profile/base/nova/migration/target.pp | |
| parent | 4a16f486e0207e47883cbc4c89293d786b9aa230 (diff) | |
Support for Ocata-Pike live-migration over ssh
In Ocata all live-migration over ssh is performed on the default ssh port (22).
In Pike the containerized live-migration over ssh is on port 2022 as the
docker host's sshd is using port 22.
To allow live migration during upgrade we need to temporarily pin the Pike
computes to port 22 and in the final converge we can switch over to port 2022.
This patch make the necessary puppet-tripleo change to allow this:
- Adds support in sshd profile for listening on multiple ports.
- Adds a profile to allow proxying to the containerized sshd from the
baremetal sshd
Change-Id: I0b80b81711f683be539939e7d084365ff63546d3
Related-bug: 1714171
(cherry picked from commit 05a413c34fa1266d38bf991a1f5ed2795631f0b7)
Diffstat (limited to 'manifests/profile/base/nova/migration/target.pp')
| -rw-r--r-- | manifests/profile/base/nova/migration/target.pp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/manifests/profile/base/nova/migration/target.pp b/manifests/profile/base/nova/migration/target.pp index 7c21028..a2f1256 100644 --- a/manifests/profile/base/nova/migration/target.pp +++ b/manifests/profile/base/nova/migration/target.pp @@ -37,12 +37,17 @@ # If the nova_migration_target service is not enabled then migration over # ssh will be disabled. # Defaults to hiera('service_names', []) +# +# [*wrapper_command*] +# (Internal) Used to override the wrapper command when proxying +# Defaults to /bin/nova-migration-wrapper class tripleo::profile::base::nova::migration::target ( $step = Integer(hiera('step')), $ssh_authorized_keys = [], $ssh_localaddrs = [], $services_enabled = hiera('service_names', []), + $wrapper_command = '/bin/nova-migration-wrapper', ) { include ::tripleo::profile::base::nova::migration @@ -81,7 +86,7 @@ class tripleo::profile::base::nova::migration::target ( type => $allow_type, order => 1, options => { - 'ForceCommand' => '/bin/nova-migration-wrapper', + 'ForceCommand' => $wrapper_command, 'PasswordAuthentication' => 'no', 'AllowTcpForwarding' => 'no', 'X11Forwarding' => 'no', |