summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-common-noha
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-noha
parent8de9c24300817b9d0ce4f2bfb2ab63643d895a1a (diff)
parent968072a6575f81d1798dfcaa3c1e3d053a742725 (diff)
Merge "Fix barbican integration on compute nodes"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-noha')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j22
3 files changed, 2 insertions, 2 deletions
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