diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-16 08:58:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-16 08:58:05 +0000 |
| commit | 6f51b6798e9e42f696ab2f64e9eb6a4f8619475a (patch) | |
| tree | 6a42827c5fac0bb8d13c628711e25a0c7b7e32fc /puppet | |
| parent | 89f9a3f2e0274169f305a503f642867ef14244e1 (diff) | |
| parent | 66b5c5d5a287198546869ba7b73a76800ccd8457 (diff) | |
Merge "Populate vnc_api_lib.ini on compute nodes with OpenContrail"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml b/puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml index e496553a..f5b1f0e6 100644 --- a/puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml +++ b/puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml @@ -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: |