From: Michael Polenchuk Date: Wed, 29 May 2019 10:59:19 +0000 (+0400) Subject: Disable block migration explicitly X-Git-Tag: opnfv-9.0.0~45 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F67970%2F1;p=fuel.git Disable block migration explicitly Functest enabled block migration by default recently but it can't be used with shared storage. Change-Id: I15fd5459df91cece02e87cda9d1ed6e575194667 Signed-off-by: Michael Polenchuk --- 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 fe844e7c1..9f19415ae 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 @@ -97,6 +97,7 @@ parameters: cacert: /etc/ssl/certs/mcp_os_cacert openrc_extra: volume_device_name: sdc + block_migration: false glance: server: <<: *db_conn_recycle_time diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 index cf09d593b..019fc0cb0 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 @@ -83,6 +83,7 @@ parameters: admin_email: ${_param:admin_email} openrc_extra: volume_device_name: sdc + block_migration: false pkgs: - keystone - python-psycopg2