diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/nova/migration/proxy.pp | 78 | ||||
| -rw-r--r-- | manifests/profile/base/nova/migration/target.pp | 7 | ||||
| -rw-r--r-- | manifests/profile/base/sshd.pp | 17 |
3 files changed, 99 insertions, 3 deletions
diff --git a/manifests/profile/base/nova/migration/proxy.pp b/manifests/profile/base/nova/migration/proxy.pp new file mode 100644 index 0000000..318a1f8 --- /dev/null +++ b/manifests/profile/base/nova/migration/proxy.pp @@ -0,0 +1,78 @@ +# Copyright 2017 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# == Class: tripleo::profile::base::nova::migration::proxy +# +# Nova migration proxy profile for tripleo. +# Used to proxy connections from baremetal sshd to dockerized sshd on a +# different port during rolling upgrades. +# +# === Parameters +# +# [*step*] +# (Optional) The current step of the deployment +# Defaults to hiera('step') +# +# [*ssh_private_key*] +# (Optional) SSH private_key for migration SSH tunnel. +# Defaults to '' +# +# [*target_host*] +# (Optional) SSH hostname to proxy. +# Defaults to hiera('fqdn_internal_api', '127.0.0.1') +# +# [*target_port*] +# (Optional) SSH port to proxy. +# Defaults to 22 + +class tripleo::profile::base::nova::migration::proxy ( + $step = Integer(hiera('step')), + $ssh_private_key = '', + $target_host = hiera('fqdn_internal_api', '127.0.0.1'), + $target_port = 22 +) { + + include ::tripleo::profile::base::nova::migration + + if $step >= 4 { + if !empty($ssh_private_key) { + class { '::tripleo::profile::base::nova::migration::target': + step => $step, + wrapper_command => "/bin/ssh \ +-p ${target_port} \ +-i /etc/nova/migration/proxy_identity \ +-o BatchMode=yes \ +-o UserKnownHostsFile=/dev/null \ +nova_migration@${target_host} \ +\$SSH_ORIGINAL_COMMAND" + } + + $migration_identity = $ssh_private_key + $migration_identity_ensure = 'present' + } + else { + $migration_identity = '' + $migration_identity_ensure = 'absent' + } + + file { '/etc/nova/migration/proxy_identity': + ensure => $migration_identity_ensure, + content => $migration_identity, + mode => '0600', + owner => 'nova_migration', + group => 'nova_migration', + require => Package['openstack-nova-migration'] + } + } +} 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', diff --git a/manifests/profile/base/sshd.pp b/manifests/profile/base/sshd.pp index 3f0245d..22520e9 100644 --- a/manifests/profile/base/sshd.pp +++ b/manifests/profile/base/sshd.pp @@ -31,11 +31,16 @@ # Hash of SSHD options to set. See the puppet-ssh module documentation for # details. # Defaults to {} +# +# [*port*] +# SSH port or list of ports to bind to +# Defaults to [22] class tripleo::profile::base::sshd ( $bannertext = hiera('BannerText', undef), $motd = hiera('MOTD', undef), - $options = {} + $options = {}, + $port = [22], ) { if $bannertext and $bannertext != '' { @@ -67,10 +72,18 @@ class tripleo::profile::base::sshd ( $sshd_options_motd = {} } + if $options['Port'] { + $sshd_options_port = {'Port' => unique(concat(any2array($options['Port']), $port))} + } + else { + $sshd_options_port = {'Port' => unique(any2array($port))} + } + $sshd_options = merge( $options, $sshd_options_banner, - $sshd_options_motd + $sshd_options_motd, + $sshd_options_port ) # NB (owalsh) in puppet-ssh hiera takes precedence over the class param |