diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-07-10 17:20:09 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-07-10 17:20:09 +0000 |
commit | 322f2dbd4c1d9c8617186bcb9211d7a1fe10ba3f (patch) | |
tree | c0714854a4d02dfb8d74a2d48f5959ee89adf028 /docker/services/mistral-api.yaml | |
parent | 83defdbdbf12a4ba9d843cd115d1acb931d1d151 (diff) | |
parent | cf18e865d14adc319b6c2dfafd650f32dad4d853 (diff) |
Merge "Copy only generated puppet files into the container"
Diffstat (limited to 'docker/services/mistral-api.yaml')
-rw-r--r-- | docker/services/mistral-api.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml index f1284280..4b2c1028 100644 --- a/docker/services/mistral-api.yaml +++ b/docker/services/mistral-api.yaml @@ -76,6 +76,11 @@ outputs: kolla_config: /var/lib/kolla/config_files/mistral_api.json: command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/api.log --server=api + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true permissions: - path: /var/log/mistral owner: mistral:mistral @@ -136,7 +141,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/mistral_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro + - /var/lib/config-data/puppet-generated/mistral/:/var/lib/kolla/config_files/src:ro - /var/log/containers/mistral:/var/log/mistral environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS |