diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-16 15:37:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-16 15:37:06 +0000 |
| commit | c2902b924da9b2246ec80e7b541950b26ebc8cde (patch) | |
| tree | 31bb23be31b135c8f60cd2fdd841de233a2594db /mcp/reclass | |
| parent | 8de9c24300817b9d0ce4f2bfb2ab63643d895a1a (diff) | |
| parent | 968072a6575f81d1798dfcaa3c1e3d053a742725 (diff) | |
Merge "Fix barbican integration on compute nodes"
Diffstat (limited to 'mcp/reclass')
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 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: 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 8ba9c6966..ed1d0649c 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml @@ -69,6 +69,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 |