X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fmcp-common-noha%2Fopenstack_init.yml.j2;h=5aae27c415ea919b5a05b1596e3d736e1b188878;hb=f172f8e3dc92710f79a33ad38aa3da6313da879c;hp=87215657429934d4ddc144c4c7f4ebf540eabe3a;hpb=7d16945d42ff8744b00d1bd87ab20df914afb06b;p=fuel.git

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 872156574..5aae27c41 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
@@ -9,9 +9,6 @@
 ---
 parameters:
   _param:
-    openstack_version: queens
-    apt_mk_version: nightly
-    mcp_repo_version: 1.1
     openstack_region: RegionOne
     admin_email: root@localhost
     cluster_public_protocol: http
@@ -85,6 +82,21 @@ parameters:
     horizon_identity_host: ${_param:cluster_vip_address}
     horizon_identity_encryption: none
     horizon_identity_version: 3
+
+    barbican_version: ${_param:openstack_version}
+    barbican_service_host: ${_param:cluster_local_address}
+    apache_barbican_api_address: ${_param:single_address}
+    mysql_barbican_password: opnfv_secret
+    keystone_barbican_password: opnfv_secret
+    barbican_simple_crypto_kek: "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY="
+    barbican_integration_enabled: true
+
+{%- if '-sfc-' in conf.MCP_DEPLOY_SCENARIO %}
+    tacker_service_host: ${_param:cluster_local_address}
+    keystone_tacker_password: opnfv_secret
+    mysql_tacker_password: opnfv_secret
+{%- endif %}
+
     aodh_version: ${_param:openstack_version}
     keystone_aodh_password: opnfv_secret
     aodh_service_host: ${_param:cluster_local_address}
@@ -106,6 +118,15 @@ parameters:
           net.ipv4.tcp_congestion_control: yeah
           net.ipv4.tcp_slow_start_after_idle: 0
           net.ipv4.tcp_fin_timeout: 30
+      repo:
+        uca:
+          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
+          key_id: EC4926EA
+          key_server: keyserver.ubuntu.com
+          pin:
+            - pin: 'release o=Canonical'
+              priority: 1200
+              package: 'openvswitch* python-openvswitch ovn* dpdk* libdpdk*'
     network:
       host:
         ctl: