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
Remove DockerNamespace references
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
multipathd.yaml
diff --git
a/docker/services/multipathd.yaml
b/docker/services/multipathd.yaml
index
d8927d4
..
51b9302
100644
(file)
--- a/
docker/services/multipathd.yaml
+++ b/
docker/services/multipathd.yaml
@@
-4,19
+4,21
@@
description: >
OpenStack containerized Multipathd service
parameters:
OpenStack containerized Multipathd service
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerMultipathdImage:
description: image
DockerMultipathdImage:
description: image
- default: 'centos-binary-multipathd:latest'
+ type: string
+ DockerMultipathdConfigImage:
+ description: The container image to use for the multipathd config_volume
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
+ ServiceData:
+ default: {}
+ description: Dictionary packing service data
+ type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@
-53,10
+55,7
@@
outputs:
config_volume: multipathd
#puppet_tags: file
step_config: ''
config_volume: multipathd
#puppet_tags: file
step_config: ''
- config_image: &multipathd_image
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerMultipathdImage} ]
+ config_image: {get_param: DockerMultipathdConfigImage}
kolla_config:
/var/lib/kolla/config_files/multipathd.json:
command: /usr/sbin/multipathd -d
kolla_config:
/var/lib/kolla/config_files/multipathd.json:
command: /usr/sbin/multipathd -d
@@
-64,7
+63,7
@@
outputs:
step_3:
multipathd:
start_order: 1
step_3:
multipathd:
start_order: 1
- image:
*multipathd_image
+ image:
{get_param: DockerMultipathdImage}
net: host
privileged: true
restart: always
net: host
privileged: true
restart: always