Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Make CephValidationDelay/Retries default consistent"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
tacker.yaml
diff --git
a/docker/services/tacker.yaml
b/docker/services/tacker.yaml
index
2fc99d6
..
793a174
100644
(file)
--- a/
docker/services/tacker.yaml
+++ b/
docker/services/tacker.yaml
@@
-13,7
+13,7
@@
parameters:
default: 'centos-binary-tacker:latest'
type: string
DockerTackerConfigImage:
default: 'centos-binary-tacker:latest'
type: string
DockerTackerConfigImage:
- description:
imag
e
+ description:
The container image to use for the tacker config_volum
e
default: 'centos-binary-tacker:latest'
type: string
EndpointMap:
default: 'centos-binary-tacker:latest'
type: string
EndpointMap:
@@
-76,15
+76,19
@@
outputs:
kolla_config:
/var/lib/kolla/config_files/tacker_api.json:
command: /usr/bin/tacker-server --config-file=/etc/tacker/tacker.conf --log-file=/var/log/tacker/api.log
kolla_config:
/var/lib/kolla/config_files/tacker_api.json:
command: /usr/bin/tacker-server --config-file=/etc/tacker/tacker.conf --log-file=/var/log/tacker/api.log
+ config_files:
+ - source: "/var/lib/kolla/config_files/src/*"
+ dest: "/"
+ merge: true
+ preserve_properties: true
permissions:
- path: /var/log/tacker
owner: tacker:tacker
recurse: true
docker_config:
# db sync runs before permissions set by kolla_config
permissions:
- path: /var/log/tacker
owner: tacker:tacker
recurse: true
docker_config:
# db sync runs before permissions set by kolla_config
- step_
3
:
+ step_
2
:
tacker_init_logs:
tacker_init_logs:
- start_order: 0
image: &tacker_image
list_join:
- '/'
image: &tacker_image
list_join:
- '/'
@@
-94,8
+98,8
@@
outputs:
volumes:
- /var/log/containers/tacker:/var/log/tacker
command: ['/bin/bash', '-c', 'chown -R tacker:tacker /var/log/tacker']
volumes:
- /var/log/containers/tacker:/var/log/tacker
command: ['/bin/bash', '-c', 'chown -R tacker:tacker /var/log/tacker']
+ step_3:
tacker_db_sync:
tacker_db_sync:
- start_order: 1
image: *tacker_image
net: host
privileged: false
image: *tacker_image
net: host
privileged: false
@@
-105,7
+109,10
@@
outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- - /var/lib/config-data/tacker/etc/:/etc/:ro
+ # FIXME(mandre) mounting /etc rw to workaround LP1696283
+ # This should go away anyway and mount the exact files it
+ # needs or use kolla set_configs.py
+ - /var/lib/config-data/tacker/etc/:/etc/
- /var/log/containers/tacker:/var/log/tacker
command: "/usr/bin/bootstrap_host_exec tacker su tacker -s /bin/bash -c 'tacker-db-manage --config-file /etc/tacker/tacker.conf upgrade head'"
step_4:
- /var/log/containers/tacker:/var/log/tacker
command: "/usr/bin/bootstrap_host_exec tacker su tacker -s /bin/bash -c 'tacker-db-manage --config-file /etc/tacker/tacker.conf upgrade head'"
step_4:
@@
-119,7
+126,7
@@
outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/tacker_api.json:/var/lib/kolla/config_files/config.json:ro
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/tacker_api.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/
tacker/etc/tacker/:/etc/tacker/
:ro
+ - /var/lib/config-data/
puppet-generated/tacker/:/var/lib/kolla/config_files/src
:ro
- /var/log/containers/tacker:/var/log/tacker
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
- /var/log/containers/tacker:/var/log/tacker
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS