Don't attempt to configure live migration

When configuring nova containers via puppet, the puppet class chain
includes a class for live migration, which configures live migration
aspects in nova and libvirt.

Some of the libvirt config parts try to notify Service[libvirt], but
that service definition is only included in nova-libvirt service, it's
not included in the control plan nova services. However, our hieradata
is currently global on the node, it's not per-service, which means even
though only nova-compute and nova-libvirt service set

  tripleo::profile::base::nova::manage_migration: true

this hiera setting is applied to all containers running puppet, most
notably the ones which configure nova control plane services. As a
result, configuration of nova control plane services failed, and in turn
the whole deployment failed.

This commit disables the libvirt part of live migration config until we
implement some better solution (e.g. hieradata separation between
different puppet containers, or move the libvirt config parts only to
nova-compute manifests in puppet-tripleo).

Change-Id: I0328406607d451e6bdce4d92c441c03648925fa7
Closes-Bug: #1684107

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: