summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-16 15:37:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-16 15:37:06 +0000
commitc2902b924da9b2246ec80e7b541950b26ebc8cde (patch)
tree31bb23be31b135c8f60cd2fdd841de233a2594db /mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
parent8de9c24300817b9d0ce4f2bfb2ab63643d895a1a (diff)
parent968072a6575f81d1798dfcaa3c1e3d053a742725 (diff)
Merge "Fix barbican integration on compute nodes"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j21
1 files changed, 1 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 f9fe73aee..a7e8fcde3 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
@@ -71,6 +71,7 @@ parameters:
cluster_node03_address: ${_param:openstack_control_node03_address}
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
glusterfs_version: '3.13'
+ barbican_integration_enabled: 'false'
nova:
controller: &db_conn_recycle_time
database: