openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Don't attempt to configure live migration"

This commit is contained in:
Jenkins 2017-04-24 13:12:00 +00:00 committed by Gerrit Code Review
parent 8c9a63b477 8c171167f6
commit 8676919e08
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/services/nova-compute.yaml
View File

@ -44,7 +44,15 @@ outputs:
description: Role data for the Nova Compute service.
value:
service_name: {get_attr: [NovaComputeBase, role_data, service_name]}
config_settings: {get_attr: [NovaComputeBase, role_data, config_settings]}
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
step_config: &step_config
get_attr: [NovaComputeBase, role_data, step_config]
puppet_config:

10
docker/services/nova-libvirt.yaml
View File

@ -50,7 +50,15 @@ outputs:
description: Role data for the Libvirt service.
value:
service_name: {get_attr: [NovaLibvirtBase, role_data, service_name]}
config_settings: {get_attr: [NovaLibvirtBase, role_data, config_settings]}
config_settings:
map_merge:
- get_attr: [NovaLibvirtBase, 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
step_config: &step_config
get_attr: [NovaLibvirtBase, role_data, step_config]
puppet_config: