openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Copy-in neutron cert via kolla extended/start"

This commit is contained in:
Zuul 2018-05-03 05:18:34 +00:00 committed by Gerrit Code Review
parent 929c5675bf bce3452104
commit 4b1cdff1fc
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/services/neutron-dhcp.yaml
View File

@ -112,6 +112,11 @@ outputs:
dest: "/"
merge: true
preserve_properties: true
- source: "/var/lib/kolla/config_files/src-tls/*"
dest: "/"
merge: true
preserve_properties: true
optional: true
permissions:
- path: /var/log/neutron
owner: neutron:neutron
@ -149,8 +154,8 @@ outputs:
-
if:
- internal_tls_enabled
- - /etc/pki/tls/certs/neutron.crt:/etc/pki/tls/certs/neutron.crt
- /etc/pki/tls/private/neutron.key:/etc/pki/tls/private/neutron.key
- - /etc/pki/tls/certs/neutron.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/neutron.crt:ro
- /etc/pki/tls/private/neutron.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/neutron.key:ro
- list_join:
- ':'
- - {get_param: InternalTLSCAFile}