Merge "Don't attempt to configure live migration"
This commit is contained in:
commit
8676919e08
|
@ -44,7 +44,15 @@ outputs:
|
||||||
description: Role data for the Nova Compute service.
|
description: Role data for the Nova Compute service.
|
||||||
value:
|
value:
|
||||||
service_name: {get_attr: [NovaComputeBase, role_data, service_name]}
|
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
|
step_config: &step_config
|
||||||
get_attr: [NovaComputeBase, role_data, step_config]
|
get_attr: [NovaComputeBase, role_data, step_config]
|
||||||
puppet_config:
|
puppet_config:
|
||||||
|
|
|
@ -50,7 +50,15 @@ outputs:
|
||||||
description: Role data for the Libvirt service.
|
description: Role data for the Libvirt service.
|
||||||
value:
|
value:
|
||||||
service_name: {get_attr: [NovaLibvirtBase, role_data, service_name]}
|
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
|
step_config: &step_config
|
||||||
get_attr: [NovaLibvirtBase, role_data, step_config]
|
get_attr: [NovaLibvirtBase, role_data, step_config]
|
||||||
puppet_config:
|
puppet_config:
|
||||||
|
|
Loading…
Reference in New Issue