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
Use Python to compute release notes version
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
neutron-plugin-ml2.yaml
diff --git
a/docker/services/neutron-plugin-ml2.yaml
b/docker/services/neutron-plugin-ml2.yaml
index
9865afd
..
8d12e0d
100644
(file)
--- a/
docker/services/neutron-plugin-ml2.yaml
+++ b/
docker/services/neutron-plugin-ml2.yaml
@@
-19,16
+19,10
@@
parameters:
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerNeutronConfigImage:
description: The container image to use for the neutron config_volume
DockerNeutronConfigImage:
description: The container image to use for the neutron config_volume
- default: 'centos-binary-neutron-server:latest'
type: string
DefaultPasswords:
type: string
DefaultPasswords:
- default: {}
type: json
RoleName:
default: ''
type: json
RoleName:
default: ''
@@
-67,9
+61,6
@@
outputs:
config_volume: 'neutron'
puppet_tags: neutron_plugin_ml2
step_config: *step_config
config_volume: 'neutron'
puppet_tags: neutron_plugin_ml2
step_config: *step_config
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
+ config_image: {get_param: DockerNeutronConfigImage}
kolla_config: {}
docker_config: {}
kolla_config: {}
docker_config: {}