summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-06-03 06:16:30 +0000
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-06-03 06:16:30 +0000
commitc5bfd72daa856240e9e15af4e10bbe6c90c1ff98 (patch)
treefec97eb102163fa03b151516a866dbd35dff82a2
parent430a0aee9e8c7400d698f460406152aa70349b6c (diff)
Revert "Disable block migration explicitly"
This reverts commit 430a0aee9e8c7400d698f460406152aa70349b6c. Superseded by the patch into releng https://gerrit.opnfv.org/gerrit/67975 Change-Id: Ibeb8419fa0ebc8eebe255e7535d775458f560ad0 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, 0 insertions, 2 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 9f19415ae..fe844e7c1 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,7 +97,6 @@ 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 019fc0cb0..cf09d593b 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,7 +83,6 @@ parameters:
admin_email: ${_param:admin_email}
openrc_extra:
volume_device_name: sdc
- block_migration: false
pkgs:
- keystone
- python-psycopg2