diff options
author | 2017-07-10 17:20:09 +0000 | |
---|---|---|
committer | 2017-07-10 17:20:09 +0000 | |
commit | 322f2dbd4c1d9c8617186bcb9211d7a1fe10ba3f (patch) | |
tree | c0714854a4d02dfb8d74a2d48f5959ee89adf028 /docker/services/ec2-api.yaml | |
parent | 83defdbdbf12a4ba9d843cd115d1acb931d1d151 (diff) | |
parent | cf18e865d14adc319b6c2dfafd650f32dad4d853 (diff) |
Merge "Copy only generated puppet files into the container"
Diffstat (limited to 'docker/services/ec2-api.yaml')
-rw-r--r-- | docker/services/ec2-api.yaml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml index d4cfe49a..e02a1469 100644 --- a/docker/services/ec2-api.yaml +++ b/docker/services/ec2-api.yaml @@ -74,12 +74,22 @@ outputs: kolla_config: /var/lib/kolla/config_files/ec2_api.json: command: /usr/bin/ec2-api + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true permissions: - path: /var/log/ec2api owner: ec2api:ec2api recurse: true /var/lib/kolla/config_files/ec2_api_metadata.json: command: /usr/bin/ec2-api-metadata + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true permissions: - path: /var/log/ec2api # default log dir for metadata service as well owner: ec2api:ec2api @@ -125,7 +135,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/ec2_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/ec2_api/etc/ec2api/:/etc/ec2api/:ro + - /var/lib/config-data/puppet-generated/ec2_api/:/var/lib/kolla/config_files/src:ro - /var/log/containers/ec2_api:/var/log/ec2api environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS @@ -139,7 +149,7 @@ outputs: - {get_attr: [ContainersCommon, volumes]} - - /var/lib/kolla/config_files/ec2_api_metadata.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/ec2_api/etc/ec2api/:/etc/ec2api/:ro + - /var/lib/config-data/puppet-generated/ec2_api/:/var/lib/kolla/config_files/src:ro - /var/log/containers/ec2_api_metadata:/var/log/ec2api environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS |