diff options
| author |   Delia Popescu <delia.popescu@enea.com> | 2018-08-13 16:28:49 +0300 |
|---|---|---|
| committer | Delia Popescu <delia.popescu@enea.com> | 2018-08-16 17:26:54 +0300 |
| commit | 968072a6575f81d1798dfcaa3c1e3d053a742725 (patch) | |
| tree | b0ed4b01f0b12ae917578064e439ac3591c0be25 /mcp/reclass/classes/cluster/mcp-common-ha | |
| parent | 9b38e04de451a60da0bc8a685612282cd1b60ee6 (diff) | |
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 <delia.popescu@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-ha')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 | 1 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 | 2 |
2 files changed, 2 insertions, 1 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 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: diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 index 7aae337c4..dc286452b 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 @@ -187,7 +187,7 @@ parameters: mysql_barbican_password: opnfv_secret keystone_barbican_password: opnfv_secret barbican_simple_crypto_kek: "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY=" - barbican_integration_enabled: false + barbican_integration_enabled: true ceilometer_secret_key: opnfv_secret horizon_version: ${_param:openstack_version} |