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/etcd.yaml | |
parent | 83defdbdbf12a4ba9d843cd115d1acb931d1d151 (diff) | |
parent | cf18e865d14adc319b6c2dfafd650f32dad4d853 (diff) |
Merge "Copy only generated puppet files into the container"
Diffstat (limited to 'docker/services/etcd.yaml')
-rw-r--r-- | docker/services/etcd.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml index 3c7c81b0..eb661af8 100644 --- a/docker/services/etcd.yaml +++ b/docker/services/etcd.yaml @@ -78,6 +78,11 @@ outputs: kolla_config: /var/lib/kolla/config_files/etcd.json: command: /usr/bin/etcd --config-file /etc/etcd/etcd.yml + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true permissions: - path: /var/lib/etcd owner: etcd:etcd @@ -96,7 +101,7 @@ outputs: - /var/lib/etcd:/var/lib/etcd - /etc/localtime:/etc/localtime:ro - /var/lib/kolla/config_files/etcd.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/etcd/etc/etcd/etcd.yml:/etc/etcd/etcd.yml:ro + - /var/lib/config-data/puppet-generated/etcd/:/var/lib/kolla/config_files/src:ro environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS docker_puppet_tasks: |