diff options
| author |   Jiri Stransky <jistr@redhat.com> | 2016-09-08 18:23:09 +0200 |
|---|---|---|
| committer | Jiri Stransky <jistr@redhat.com> | 2016-09-08 18:23:09 +0200 |
| commit | 66b5c5d5a287198546869ba7b73a76800ccd8457 (patch) | |
| tree | b07d44d79a6282359da881f4b5936afbce199f63 /puppet/extraconfig/pre_deploy/compute | |
| parent | 6480942f4b2fbe49a9ea1a73bcbdb0878271e84e (diff) | |
Populate vnc_api_lib.ini on compute nodes with OpenContrail
This is setting sane defaults for vnc_api_lib.ini as requested from the
field. The settings still can be overriden using NovaComputeExtraConfig
if needed.
Change-Id: I6a823c0b34f6ea21aa16939577ac0e1563483557
Closes-Bug: #1620647
Diffstat (limited to 'puppet/extraconfig/pre_deploy/compute')
| -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: |