Merge "Use provided qemu.conf in libvirt container"

[apex-tripleo-heat-templates.git] / puppet / extraconfig / pre_deploy / compute / neutron-opencontrail.yaml

diff --git a/puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml b/puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml
index e496553..66252f1 100644 (file)
--- a/puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml
+++ b/puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: Compute node hieradata for Neutron OpenContrail configuration
 
@@ -32,6 +32,18 @@ resources:
                 contrail::vrouter::provision_vrouter::keystone_admin_tenant_name: admin
                 contrail::vrouter::provision_vrouter::keystone_admin_password: '"%{::admin_password}"'
 
+                contrail::vnc_api::vnc_api_config:
+                  'auth/AUTHN_TYPE':
+                    value: keystone
+                  'auth/AUTHN_PROTOCOL':
+                    value: http
+                  'auth/AUTHN_SERVER':
+                    value: "%{hiera('keystone_admin_api_vip')}"
+                  'auth/AUTHN_PORT':
+                    value: 35357
+                  'auth/AUTHN_URL':
+                    value: '/v2.0/tokens'
+
   ComputeContrailDeployment:
     type: OS::Heat::StructuredDeployment
     properties: