Merge "[noha] Parameterize network configuration"

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 f9fe73a..a7e8fcd 100644 (file)
--- 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 7aae337..dc28645 100644 (file)
--- 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 32aefd2..5c9c16d 100644 (file)
--- 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 c39249b..48f99ca 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
@@ -70,6 +70,7 @@ parameters:
     interface_mtu: 1500
     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 e25d8e3..da6d306 100644 (file)
--- 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