summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-06-04 04:39:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-06-04 04:39:45 +0000
commit0e56195965eea0ecaaeedcf668e58eb75d0c1631 (patch)
treedf4ec25c80dfddaf34a457b51b6953df79727987 /mcp
parenta7e9257bbfd20739069272e89bc50f5ba6dba831 (diff)
parentc5bfd72daa856240e9e15af4e10bbe6c90c1ff98 (diff)
Merge "Revert "Disable block migration explicitly""
Diffstat (limited to 'mcp')
-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