commit e6fbc070cdd8156b755f85bc9fa7d419f94e500c
author Jakub Josef <jjosef@mirantis.com> Thu Nov 16 15:05:56 2017 +0000
committer Gerrit Code Review <gerrit2@44cc31867e31> Thu Nov 16 15:05:56 2017 +0000
tree e56ea34de66d3ce4398f7c3abdc4a87c638e691e
parent 1cb790dd3f23977f2b8d407182c147bb7f38a17a
parent 8c60f6884cc9fe0dbb3d2ad2c92be93fe68a4d98

Merge "Add support for new schema of deploy salt master."

classes/cluster/virtual-mcp11-aio/openstack/init.yml

diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index f1b70a8..03d7636 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -121,7 +121,7 @@
     openstack_public_neutron_subnet_allocation_start: 192.168.130.10
     openstack_public_neutron_subnet_allocation_end: 192.168.130.254
     barbican_simple_crypto_kek: YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY=
-    barbican_integration_enabled: True
+    barbican_integration_enabled: False
   galera:
     master:
       members: ~
@@ -147,7 +147,7 @@
   nova:
     compute:
       barbican:
-        enable: ${_param:barbican_integration_enabled}
+        enabled: ${_param:barbican_integration_enabled}
       vncproxy_url: http://${_param:single_address}:6080
       network:
         user: neutron