aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-04 17:30:30 +0000
committerGerrit Code Review <review@openstack.org>2017-05-04 17:30:30 +0000
commit5e45513f399f1eccd27bfaf6679db50025d1a094 (patch)
tree7750160b7f56f8adee411f3b90f216a0af2b560f /manifests/profile/base
parentc35ea72c29952975422e7bf6bccf8fbcc010438b (diff)
parentf8ca94a5b7c7658631f5b0a9b010251ebbcff65e (diff)
Merge "Restrict nova migration ssh tunnel"
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/nova.pp159
1 files changed, 101 insertions, 58 deletions
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index ab9b615..65355d4 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -87,29 +87,35 @@
# Expects a hash with keys 'private_key' and 'public_key'.
# Defaults to {}
#
+# [*migration_ssh_localaddrs*]
+# (Optional) Restrict ssh migration to clients connecting via this list of
+# IPs.
+# Defaults to [] (no restriction)
+#
# [*libvirt_tls*]
# (Optional) Whether or not libvird TLS service is enabled.
# Defaults to false
class tripleo::profile::base::nova (
- $bootstrap_node = hiera('bootstrap_nodeid', undef),
- $libvirt_enabled = false,
- $manage_migration = false,
- $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
- $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
- $oslomsg_rpc_password = hiera('nova::rabbit_password'),
- $oslomsg_rpc_port = hiera('nova::rabbit_port', '5672'),
- $oslomsg_rpc_username = hiera('nova::rabbit_userid', 'guest'),
- $oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
- $oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
- $oslomsg_notify_password = hiera('nova::rabbit_password'),
- $oslomsg_notify_port = hiera('nova::rabbit_port', '5672'),
- $oslomsg_notify_username = hiera('nova::rabbit_userid', 'guest'),
- $oslomsg_use_ssl = hiera('nova::rabbit_use_ssl', '0'),
- $nova_compute_enabled = false,
- $step = hiera('step'),
- $migration_ssh_key = {},
- $libvirt_tls = false
+ $bootstrap_node = hiera('bootstrap_nodeid', undef),
+ $libvirt_enabled = false,
+ $manage_migration = false,
+ $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
+ $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
+ $oslomsg_rpc_password = hiera('nova::rabbit_password'),
+ $oslomsg_rpc_port = hiera('nova::rabbit_port', '5672'),
+ $oslomsg_rpc_username = hiera('nova::rabbit_userid', 'guest'),
+ $oslomsg_notify_proto = hiera('messaging_notify_service_name', 'rabbit'),
+ $oslomsg_notify_hosts = any2array(hiera('rabbitmq_node_names', undef)),
+ $oslomsg_notify_password = hiera('nova::rabbit_password'),
+ $oslomsg_notify_port = hiera('nova::rabbit_port', '5672'),
+ $oslomsg_notify_username = hiera('nova::rabbit_userid', 'guest'),
+ $oslomsg_use_ssl = hiera('nova::rabbit_use_ssl', '0'),
+ $nova_compute_enabled = false,
+ $step = hiera('step'),
+ $migration_ssh_key = {},
+ $migration_ssh_localaddrs = [],
+ $libvirt_tls = false
) {
if $::hostname == downcase($bootstrap_node) {
$sync_db = true
@@ -131,10 +137,29 @@ class tripleo::profile::base::nova (
backend => 'oslo_cache.memcache_pool',
memcache_servers => $memcache_servers,
}
+ class { '::nova':
+ default_transport_url => os_transport_url({
+ 'transport' => $oslomsg_rpc_proto,
+ 'hosts' => $oslomsg_rpc_hosts,
+ 'port' => $oslomsg_rpc_port,
+ 'username' => $oslomsg_rpc_username,
+ 'password' => $oslomsg_rpc_password,
+ 'ssl' => $oslomsg_use_ssl_real,
+ }),
+ notification_transport_url => os_transport_url({
+ 'transport' => $oslomsg_notify_proto,
+ 'hosts' => $oslomsg_notify_hosts,
+ 'port' => $oslomsg_notify_port,
+ 'username' => $oslomsg_notify_username,
+ 'password' => $oslomsg_notify_password,
+ 'ssl' => $oslomsg_use_ssl_real,
+ }),
+ }
include ::nova::placement
+ }
- if $step >= 4 and $manage_migration {
-
+ if $step >= 4 {
+ if $manage_migration {
# Libvirt setup (live-migration)
if $libvirt_tls {
class { '::nova::migration::libvirt':
@@ -148,57 +173,75 @@ class tripleo::profile::base::nova (
transport => 'ssh',
configure_libvirt => $libvirt_enabled,
configure_nova => $nova_compute_enabled,
- client_user => 'nova',
- client_extraparams => {'keyfile' => '/var/lib/nova/.ssh/id_rsa'}
+ client_user => 'nova_migration',
+ client_extraparams => {'keyfile' => '/etc/nova/migration/identity'}
}
}
- if $migration_ssh_key != {} {
+ $services_enabled = hiera('service_names', [])
+ if !empty($migration_ssh_key) and 'sshd' in $services_enabled {
# Nova SSH tunnel setup (cold-migration)
- #TODO: Remove me when https://review.rdoproject.org/r/#/c/4008 lands
- user { 'nova':
- ensure => present,
- shell => '/bin/bash',
+ # Server side
+ if !empty($migration_ssh_localaddrs) {
+ $allow_type = sprintf('LocalAddress %s User', join($migration_ssh_localaddrs,','))
+ $deny_type = 'LocalAddress'
+ $deny_name = sprintf('!%s', join($migration_ssh_localaddrs,',!'))
+
+ ssh::server::match_block { 'nova_migration deny':
+ name => $deny_name,
+ type => $deny_type,
+ order => 2,
+ options => {
+ 'DenyUsers' => 'nova_migration'
+ },
+ notify => Service['sshd']
+ }
+ }
+ else {
+ $allow_type = 'User'
+ }
+ $allow_name = 'nova_migration'
+
+ ssh::server::match_block { 'nova_migration allow':
+ name => $allow_name,
+ type => $allow_type,
+ order => 1,
+ options => {
+ 'ForceCommand' => '/bin/nova-migration-wrapper',
+ 'PasswordAuthentication' => 'no',
+ 'AllowTcpForwarding' => 'no',
+ 'X11Forwarding' => 'no',
+ 'AuthorizedKeysFile' => '/etc/nova/migration/authorized_keys'
+ },
+ notify => Service['sshd']
}
- $private_key_parts = split($migration_ssh_key['public_key'], ' ')
- $nova_public_key = {
- type => $private_key_parts[0],
- key => $private_key_parts[1]
+ file { '/etc/nova/migration/authorized_keys':
+ content => $migration_ssh_key['public_key'],
+ mode => '0640',
+ owner => 'root',
+ group => 'nova_migration',
+ require => Package['openstack-nova-migration'],
}
- $nova_private_key = {
- type => $private_key_parts[0],
- key => $migration_ssh_key['private_key']
+
+ # Client side
+ file { '/etc/nova/migration/identity':
+ content => $migration_ssh_key['private_key'],
+ mode => '0600',
+ owner => 'nova',
+ group => 'nova',
+ require => Package['openstack-nova-migration'],
}
+ $migration_pkg_ensure = installed
} else {
- $nova_public_key = undef
- $nova_private_key = undef
+ $migration_pkg_ensure = absent
}
} else {
- $nova_public_key = undef
- $nova_private_key = undef
+ $migration_pkg_ensure = absent
}
-
- class { '::nova':
- default_transport_url => os_transport_url({
- 'transport' => $oslomsg_rpc_proto,
- 'hosts' => $oslomsg_rpc_hosts,
- 'port' => $oslomsg_rpc_port,
- 'username' => $oslomsg_rpc_username,
- 'password' => $oslomsg_rpc_password,
- 'ssl' => $oslomsg_use_ssl_real,
- }),
- notification_transport_url => os_transport_url({
- 'transport' => $oslomsg_notify_proto,
- 'hosts' => $oslomsg_notify_hosts,
- 'port' => $oslomsg_notify_port,
- 'username' => $oslomsg_notify_username,
- 'password' => $oslomsg_notify_password,
- 'ssl' => $oslomsg_use_ssl_real,
- }),
- nova_public_key => $nova_public_key,
- nova_private_key => $nova_private_key,
+ package {'openstack-nova-migration':
+ ensure => $migration_pkg_ensure
}
}
}