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 "Add stack_name/ctlplane_service_ips into post-upgrade.j2.yaml"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
mistral-api.yaml
diff --git
a/docker/services/mistral-api.yaml
b/docker/services/mistral-api.yaml
index
30c3cde
..
f128428
100644
(file)
--- a/
docker/services/mistral-api.yaml
+++ b/
docker/services/mistral-api.yaml
@@
-13,7
+13,7
@@
parameters:
default: 'centos-binary-mistral-api:latest'
type: string
DockerMistralConfigImage:
default: 'centos-binary-mistral-api:latest'
type: string
DockerMistralConfigImage:
- description:
imag
e
+ description:
The container image to use for the mistral config_volum
e
default: 'centos-binary-mistral-api:latest'
type: string
EndpointMap:
default: 'centos-binary-mistral-api:latest'
type: string
EndpointMap:
@@
-84,7
+84,7
@@
outputs:
# db sync runs before permissions set by kolla_config
step_2:
mistral_init_logs:
# db sync runs before permissions set by kolla_config
step_2:
mistral_init_logs:
- image: &mistral_image
+ image: &mistral_
api_
image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMistralApiImage} ]
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerMistralApiImage} ]
@@
-96,7
+96,7
@@
outputs:
step_3:
mistral_db_sync:
start_order: 0
step_3:
mistral_db_sync:
start_order: 0
- image: *mistral_image
+ image: *mistral_
api_
image
net: host
privileged: false
detach: false
net: host
privileged: false
detach: false
@@
-110,7
+110,7
@@
outputs:
command: "/usr/bin/bootstrap_host_exec mistral_api su mistral -s /bin/bash -c 'mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head'"
mistral_db_populate:
start_order: 1
command: "/usr/bin/bootstrap_host_exec mistral_api su mistral -s /bin/bash -c 'mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head'"
mistral_db_populate:
start_order: 1
- image: *mistral_image
+ image: *mistral_
api_
image
net: host
privileged: false
detach: false
net: host
privileged: false
detach: false
@@
-127,7
+127,7
@@
outputs:
step_4:
mistral_api:
start_order: 15
step_4:
mistral_api:
start_order: 15
- image: *mistral_image
+ image: *mistral_
api_
image
net: host
privileged: false
restart: always
net: host
privileged: false
restart: always