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 "Refactor iscsi initiator-name reset into separate service"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
nova-consoleauth.yaml
diff --git
a/docker/services/nova-consoleauth.yaml
b/docker/services/nova-consoleauth.yaml
index
11e69ba
..
0d3d1ec
100644
(file)
--- a/
docker/services/nova-consoleauth.yaml
+++ b/
docker/services/nova-consoleauth.yaml
@@
-4,17
+4,11
@@
description: >
OpenStack containerized Nova Consoleauth service
parameters:
OpenStack containerized Nova Consoleauth service
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerNovaConsoleauthImage:
description: image
DockerNovaConsoleauthImage:
description: image
- default: 'centos-binary-nova-consoleauth:latest'
type: string
DockerNovaConfigImage:
description: The container image to use for the nova config_volume
type: string
DockerNovaConfigImage:
description: The container image to use for the nova config_volume
- default: 'centos-binary-nova-base:latest'
type: string
EndpointMap:
default: {}
type: string
EndpointMap:
default: {}
@@
-72,10
+66,7
@@
outputs:
config_volume: nova
puppet_tags: nova_config
step_config: *step_config
config_volume: nova
puppet_tags: nova_config
step_config: *step_config
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
+ config_image: {get_param: DockerNovaConfigImage}
kolla_config:
/var/lib/kolla/config_files/nova_consoleauth.json:
command: /usr/bin/nova-consoleauth
kolla_config:
/var/lib/kolla/config_files/nova_consoleauth.json:
command: /usr/bin/nova-consoleauth
@@
-91,10
+82,7
@@
outputs:
docker_config:
step_4:
nova_consoleauth:
docker_config:
step_4:
nova_consoleauth:
- image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNovaConsoleauthImage} ]
+ image: {get_param: DockerNovaConsoleauthImage}
net: host
privileged: false
restart: always
net: host
privileged: false
restart: always