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 sample usage of StorageMgmt network for compute nodes"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
horizon.yaml
diff --git
a/docker/services/horizon.yaml
b/docker/services/horizon.yaml
index
022eb5d
..
5797b20
100644
(file)
--- a/
docker/services/horizon.yaml
+++ b/
docker/services/horizon.yaml
@@
-12,6
+12,10
@@
parameters:
description: image
default: 'centos-binary-horizon:latest'
type: string
description: image
default: 'centos-binary-horizon:latest'
type: string
+ DockerHorizonConfigImage:
+ description: The container image to use for the horizon config_volume
+ default: 'centos-binary-horizon:latest'
+ type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-70,10
+74,10
@@
outputs:
config_volume: horizon
puppet_tags: horizon_config
step_config: {get_attr: [HorizonBase, role_data, step_config]}
config_volume: horizon
puppet_tags: horizon_config
step_config: {get_attr: [HorizonBase, role_data, step_config]}
- config_image:
&horizon_image
+ config_image:
list_join:
- '/'
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerHorizonImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerHorizon
Config
Image} ]
kolla_config:
/var/lib/kolla/config_files/horizon.json:
command: /usr/sbin/httpd -DFOREGROUND
kolla_config:
/var/lib/kolla/config_files/horizon.json:
command: /usr/sbin/httpd -DFOREGROUND
@@
-86,9
+90,12
@@
outputs:
owner: apache:apache
recurse: false
docker_config:
owner: apache:apache
recurse: false
docker_config:
- step_
3
:
+ step_
2
:
horizon_fix_perms:
horizon_fix_perms:
- image: *horizon_image
+ image: &horizon_image
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerHorizonImage} ]
user: root
# NOTE Set ownership for /var/log/horizon/horizon.log file here,
# otherwise it's created by root when generating django cache.
user: root
# NOTE Set ownership for /var/log/horizon/horizon.log file here,
# otherwise it's created by root when generating django cache.
@@
-99,8
+106,8
@@
outputs:
volumes:
- /var/log/containers/horizon:/var/log/horizon
- /var/lib/config-data/horizon/etc/:/etc/
volumes:
- /var/log/containers/horizon:/var/log/horizon
- /var/lib/config-data/horizon/etc/:/etc/
+ step_3:
horizon:
horizon:
- start_order: 1
image: *horizon_image
net: host
privileged: false
image: *horizon_image
net: host
privileged: false