diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-24 15:22:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-24 15:22:39 +0000 |
| commit | 86621ff34a9c719cd68d61154a7987d491176038 (patch) | |
| tree | 0e004df2eea511c154df9a51341581ae6fe6ca07 /docker/services/nova-compute.yaml | |
| parent | 5cbcc8377c49e395dc1d02a976d9b4a94253f5ca (diff) | |
| parent | 4a7f3398f115a4eaab6993b0aad9c16fa7f55afa (diff) | |
Merge "Add support for nova live/cold-migration with containers"
Diffstat (limited to 'docker/services/nova-compute.yaml')
| -rw-r--r-- | docker/services/nova-compute.yaml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index 3ee3e431..0426eaec 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -36,6 +36,11 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + DockerNovaMigrationSshdPort: + default: 2022 + description: Port that dockerized nova migration target sshd service + binds to. + type: number resources: @@ -51,6 +56,7 @@ resources: DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} + MigrationSshPort: {get_param: DockerNovaMigrationSshdPort} outputs: role_data: @@ -58,14 +64,7 @@ outputs: value: service_name: {get_attr: [NovaComputeBase, role_data, service_name]} config_settings: - map_merge: - - get_attr: [NovaComputeBase, role_data, config_settings] - # FIXME: we need to disable migration for now as the - # hieradata is common for all services, and this means nova - # and nova_placement puppet runs also try to configure - # libvirt, and they fail. We can remove this override when - # we have hieradata separation between containers. - - tripleo::profile::base::nova::manage_migration: false + get_attr: [NovaComputeBase, role_data, config_settings] step_config: &step_config get_attr: [NovaComputeBase, role_data, step_config] puppet_config: |