diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-25 18:45:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-25 18:45:36 +0000 |
| commit | f0bff54e52fb7c097537eb45ebef8a758592fb1b (patch) | |
| tree | 8de7be98670fd271a6c7224477cdd207c070a8bd /puppet | |
| parent | 1822ab1c4a201ac952200b52ab600661ea3fea97 (diff) | |
| parent | 1eeedbc095c432082c9a6d08c4d15ece36769a52 (diff) | |
Merge "Add migration SSH tunneling support" into stable/ocata
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/nova-compute.yaml | 8 | ||||
| -rw-r--r-- | puppet/services/nova-libvirt.yaml | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index a9737eb6..b1711436 100644 --- a/puppet/services/nova-compute.yaml +++ b/puppet/services/nova-compute.yaml @@ -79,6 +79,13 @@ parameters: type: string description: Nova Compute upgrade level default: auto + MigrationSshKey: + type: json + description: > + SSH key for migration. + Expects a dictionary with keys 'public_key' and 'private_key'. + Values should be identical to SSH public/private key files. + default: {} resources: NovaBase: @@ -111,6 +118,7 @@ outputs: # we manage migration in nova common puppet profile nova::compute::libvirt::migration_support: false tripleo::profile::base::nova::manage_migration: true + tripleo::profile::base::nova::migration_ssh_key: {get_param: MigrationSshKey} tripleo::profile::base::nova::nova_compute_enabled: true nova::compute::rbd::libvirt_images_rbd_pool: {get_param: NovaRbdPoolName} nova::compute::rbd::libvirt_rbd_user: {get_param: CephClientUserName} diff --git a/puppet/services/nova-libvirt.yaml b/puppet/services/nova-libvirt.yaml index faf1ae48..b297424e 100644 --- a/puppet/services/nova-libvirt.yaml +++ b/puppet/services/nova-libvirt.yaml @@ -66,7 +66,6 @@ outputs: tripleo.nova_libvirt.firewall_rules: '200 nova_libvirt': dport: - - 16509 - 16514 - '49152-49215' - '5900-5999' |