commit d8f7cdf6d63f40bde50072bd526bd1cdbcb470a6
author Marek Celoud <mceloud@mirantis.com> Fri Oct 20 10:46:00 2017 +0000
committer Gerrit Code Review <gerrit2@7cd0c2eb159e> Fri Oct 20 10:46:00 2017 +0000
tree 54aff78cfa0a12601fe710e356db79bcb55ac94f
parent 77dfb37d25f8db86cc5bad98d73c6102337e7033
parent 08f32b0c9a7dba25599a50df4f0c6fa6d6cd05dc

Merge "Add Barbican integration to AIO model"

classes/cluster/k8s-ha-calico/kubernetes/init.yml

diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index d8e5c25..7eecf89 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -31,11 +31,11 @@
 
     # switches of addons
     kubernetes_addon_namespace: kube-system
-    kubernetes_dashboard: false
+    kubernetes_dashboard: true
     kubernetes_helm_enabled: false
     kubernetes_netchecker_enabled: true
     kubernetes_calico_policy_enabled: false
-    kubernetes_virtlet_enabled: false
+    kubernetes_virtlet_enabled: true
 
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1

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 779f7ad..d0f3364 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -130,6 +130,7 @@
       enabled: false
   barbican:
     server:
+      ks_notifications_enable: True
       store:
         software:
           crypto_plugin: simple_crypto