From 968072a6575f81d1798dfcaa3c1e3d053a742725 Mon Sep 17 00:00:00 2001 From: Delia Popescu Date: Mon, 13 Aug 2018 16:28:49 +0300 Subject: Fix barbican integration on compute nodes Locally overwriting barbican_integration_enable on compute nodes does not work. Set barbican_integration_enable to true by default. Disable barbican_integration at openstack_control side. While at it, enable barbican on ha scenarios too. JIRA: FUNCTEST-981 Change-Id: I3c8df5d4078f73f32f3605dec5a7a365fa386019 Signed-off-by: Delia Popescu --- mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 | 1 + 1 file changed, 1 insertion(+) (limited to 'mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2') 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 33c74fda6..49c299bdf 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 @@ -70,6 +70,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: -- cgit 1.2.3-korg