From 968072a6575f81d1798dfcaa3c1e3d053a742725 Mon Sep 17 00:00:00 2001 From: Delia Popescu Date: Mon, 13 Aug 2018 16:28:49 +0300 Subject: [PATCH] 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 + mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 | 2 +- mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml | 1 - mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml | 1 + mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 | 2 +- 5 files changed, 4 insertions(+), 3 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} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml index 32aefd29c..5c9c16d6b 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml @@ -22,7 +22,6 @@ parameters: _param: interface_mtu: 9000 linux_system_codename: xenial - barbican_integration_enabled: true nova: compute: libvirt_service: libvirtd diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml index 0eeff7c05..2ca17ef73 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml @@ -68,6 +68,7 @@ parameters: _param: linux_system_codename: xenial ceilometer_create_gnocchi_resources: 'True' + barbican_integration_enabled: 'false' linux: system: package: diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 index e25d8e301..da6d30601 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 @@ -91,7 +91,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 aodh_version: ${_param:openstack_version} keystone_aodh_password: opnfv_secret -- 2.16.6