commit bb95733b627ce2454ef8a9f829d75bc7bc490b5c
author Petr Michalec <pmichalec@mirantis.com> Mon Oct 23 10:11:54 2017 +0000
committer Gerrit Code Review <gerrit2@7cd0c2eb159e> Mon Oct 23 10:11:55 2017 +0000
tree ca6074dbdcf3fecac287634b1c59ed3d3c4c5ab6
parent d8f7cdf6d63f40bde50072bd526bd1cdbcb470a6
parent 226ec697a0780435d88e40c1f0636c29813a6ad8

Merge "Remove openstack_telemetry keepalived instance parameters"

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 ff213c4..d0f3364 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -120,6 +120,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
   galera:
     master:
       members: ~
@@ -129,6 +130,7 @@
       enabled: false
   barbican:
     server:
+      ks_notifications_enable: True
       store:
         software:
           crypto_plugin: simple_crypto
@@ -143,6 +145,8 @@
       dvr: True
   nova:
     compute:
+      barbican:
+        enable: ${_param:barbican_integration_enabled}
       vncproxy_url: http://${_param:single_address}:6080
       network:
         user: neutron
@@ -151,8 +155,13 @@
       cache:
         members: ~
     controller:
+      barbican:
+        enabled: ${_param:barbican_integration_enabled}
       vncproxy_url: http://${_param:single_address}:6080
   cinder:
+    controller:
+      barbican:
+        enabled: ${_param:barbican_integration_enabled}
     volume:
       cache:
         members: ~
@@ -162,3 +171,7 @@
   designate:
     worker:
       enabled: ${_param:designate_worker_enabled}
+  glance:
+    server:
+      barbican:
+        enabled: ${_param:barbican_integration_enabled}