Revert "Disable block migration explicitly"

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-ha / openstack_control.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index 0770f5c..fe844e7 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -7,7 +7,6 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
   - system.ceilometer.client
   - system.memcached.server.single
   - system.keystone.server.cluster
@@ -28,6 +27,7 @@ classes:
   - system.glusterfs.client.cluster
   - system.glusterfs.client.volume.glance
   - system.glusterfs.client.volume.keystone
+  - cluster.all-mcp-arch-common.backports
   - cluster.mcp-common-ha.glusterfs_repo
 {%- if not conf.MCP_VCP %}
   # sync from kvm
@@ -87,6 +87,7 @@ parameters:
       <<: *db_conn_recycle_time
       vlan_aware_vms: true
       root_helper_daemon: false
+      agent_down_time: 300
       global_physnet_mtu: ${_param:interface_mtu}
       backend:
         external_mtu: ${_param:interface_mtu}