summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-05-29 14:59:19 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-05-29 14:59:19 +0400
commit430a0aee9e8c7400d698f460406152aa70349b6c (patch)
tree17ab825fd1f63bdbb8cf35b8948aea9a83fcaf66
parent60bf21d6aedda367c3e017cd74ea8cf602f1fdef (diff)
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 <mpolenchuk@mirantis.com>
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j21
2 files changed, 2 insertions, 0 deletions
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