diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-24 13:12:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-24 13:12:00 +0000 |
| commit | 8676919e08ae58875e8315c58bd269d39c5c1c3e (patch) | |
| tree | adb28dbfc36b71f25103d908305fb5304d69c8c7 /docker/services | |
| parent | 8c9a63b477ea99971660afbe70359f164c2723b4 (diff) | |
| parent | 8c171167f6e6d00b2426e5242d4a3227bb42d0e6 (diff) | |
Merge "Don't attempt to configure live migration"
Diffstat (limited to 'docker/services')
| -rw-r--r-- | docker/services/nova-compute.yaml | 10 | ||||
| -rw-r--r-- | docker/services/nova-libvirt.yaml | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index c347b113..a695ce2a 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -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: diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml index ba637605..1f7205ba 100644 --- a/docker/services/nova-libvirt.yaml +++ b/docker/services/nova-libvirt.yaml @@ -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: |