openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix neutron api TLS issues"

This commit is contained in:
Zuul 2019-11-18 13:55:32 +00:00 committed by Gerrit Code Review
parent c67d7e39ad a7db39af7c
commit 482e3f5489
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/neutron/neutron-api-container-puppet.yaml
View File

@ -420,6 +420,11 @@ outputs:
dest: "/" dest: "/"
merge: true merge: true
preserve_properties: true preserve_properties: true
- source: "/var/lib/kolla/config_files/src-tls/*"
dest: "/"
merge: true
optional: true
preserve_properties: true
permissions: permissions:
- path: /var/log/neutron - path: /var/log/neutron
owner: neutron:neutron owner: neutron:neutron
@ -485,8 +490,8 @@ outputs:
- if: - if:
- ovn_and_tls - ovn_and_tls
- -
- /etc/pki/tls/certs/ovn_neutron_client.crt:/etc/pki/tls/certs/ovn_neutron_client.crt - /etc/pki/tls/certs/ovn_neutron_client.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/ovn_neutron_client.crt:ro
- /etc/pki/tls/private/ovn_neutron_client.key:/etc/pki/tls/private/ovn_neutron_client.key - /etc/pki/tls/private/ovn_neutron_client.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/ovn_neutron_client.key:ro
- null - null
environment: environment:
map_merge: map_merge:
@ -502,6 +507,7 @@ outputs:
volumes: volumes:
list_concat: list_concat:
- {get_attr: [ContainersCommon, volumes]} - {get_attr: [ContainersCommon, volumes]}
- {get_attr: [NeutronLogging, volumes]}
- -
- /var/lib/kolla/config_files/neutron_server_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/neutron_server_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro