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 ceilometer crontab removal idempotent"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
tacker.yaml
diff --git
a/docker/services/tacker.yaml
b/docker/services/tacker.yaml
index
2fc99d6
..
84175c5
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:
@@
-82,9
+82,8
@@
outputs:
recurse: true
docker_config:
# db sync runs before permissions set by kolla_config
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
+93,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