diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-05 10:09:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-05 10:09:46 +0000 |
| commit | 0ff01e369c84232c439f98799a623f04f36b7f0c (patch) | |
| tree | f69ac29d1c009fbf68f7b2443e80167fef15ff4c /docker | |
| parent | 2ccd6585ccf67cc67f15f2a1c364e7cd8dcfb01b (diff) | |
| parent | d53feb830bcbfa35722c0eac5937b5157628c827 (diff) | |
Merge "Bind mount needed cert for haproxy"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/haproxy.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml index 242f0751..5831fe89 100644 --- a/docker/services/haproxy.yaml +++ b/docker/services/haproxy.yaml @@ -42,6 +42,11 @@ parameters: default: /dev/log description: Syslog address where HAproxy will send its log type: string + DeployedSSLCertificatePath: + default: '/etc/pki/tls/private/overcloud_endpoint.pem' + description: > + The filepath of the certificate as it will be stored in the controller. + type: string RedisPassword: description: The password for Redis type: string @@ -93,6 +98,12 @@ outputs: list_join: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerHAProxyConfigImage} ] + volumes: &deployed_cert_mount + - list_join: + - ':' + - - {get_param: DeployedSSLCertificatePath} + - {get_param: DeployedSSLCertificatePath} + - 'ro' kolla_config: /var/lib/kolla/config_files/haproxy.json: command: haproxy -f /etc/haproxy/haproxy.cfg @@ -109,6 +120,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} + - *deployed_cert_mount - - /var/lib/kolla/config_files/haproxy.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/haproxy/etc/:/etc/:ro |