diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-10-07 05:38:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-10-07 05:38:24 +0000 |
| commit | 93437ceaeb5842a6d78cf306324afca12e4cd113 (patch) | |
| tree | 12ca01df3ec9e2a67e4f742ce05315b679551127 /puppet | |
| parent | e283f1c6f5a0a72fc941a97b385bf927248fe8e8 (diff) | |
| parent | 35d0e2d7dfab68943f9306ef579cacf502a146c3 (diff) | |
Merge "Support for Ocata-Pike live-migration over ssh" into stable/pike
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/nova-compute.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/nova-libvirt.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/nova-migration-target.yaml | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index 22a743e0..9e5ba129 100644 --- a/puppet/services/nova-compute.yaml +++ b/puppet/services/nova-compute.yaml @@ -108,7 +108,7 @@ parameters: public_key: '' private_key: '' MigrationSshPort: - default: 22 + default: 2022 description: Target port for migration over ssh type: number diff --git a/puppet/services/nova-libvirt.yaml b/puppet/services/nova-libvirt.yaml index 3f37cd94..ac7cc8f1 100644 --- a/puppet/services/nova-libvirt.yaml +++ b/puppet/services/nova-libvirt.yaml @@ -94,7 +94,7 @@ parameters: public_key: '' private_key: '' MigrationSshPort: - default: 22 + default: 2022 description: Target port for migration over ssh type: number diff --git a/puppet/services/nova-migration-target.yaml b/puppet/services/nova-migration-target.yaml index 128abc2c..0c2b419e 100644 --- a/puppet/services/nova-migration-target.yaml +++ b/puppet/services/nova-migration-target.yaml @@ -39,6 +39,10 @@ parameters: default: public_key: '' private_key: '' + MigrationSshPort: + default: 2022 + description: Target port for migration over ssh + type: number outputs: role_data: @@ -53,5 +57,12 @@ outputs: - "%{hiera('live_migration_ssh_inbound_addr')}" live_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaLibvirtNetwork]} cold_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaColdMigrationNetwork]} + tripleo::profile::base::sshd::port: + - 22 + - {get_param: MigrationSshPort} + tripleo.nova_migration_target.firewall_rules: + '113 nova_migration_target': + dport: + - {get_param: MigrationSshPort} step_config: | include tripleo::profile::base::nova::migration::target |