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 DeployedServerEnvironmentOutput"
[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
2e5384e
..
aa62bde
100644
(file)
--- a/
docker/services/neutron-plugin-ml2.yaml
+++ b/
docker/services/neutron-plugin-ml2.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
ocata
+heat_template_version:
pike
description: >
OpenStack containerized Neutron ML2 Plugin configured with Puppet
description: >
OpenStack containerized Neutron ML2 Plugin configured with Puppet
@@
-20,7
+20,7
@@
parameters:
default: 'tripleoupstream'
type: string
DockerNeutronConfigImage:
default: 'tripleoupstream'
type: string
DockerNeutronConfigImage:
- description:
imag
e
+ description:
The container image to use for the neutron config_volum
e
default: 'centos-binary-neutron-server:latest'
type: string
DefaultPasswords:
default: 'centos-binary-neutron-server:latest'
type: string
DefaultPasswords:
@@
-38,7
+38,7
@@
parameters:
resources:
NeutronBase:
resources:
NeutronBase:
- type:
../../puppet/services/neutron-plugin-ml2.yaml
+ type:
OS::TripleO::Docker::NeutronMl2PluginBase
properties:
EndpointMap: {get_param: EndpointMap}
ServiceNetMap: {get_param: ServiceNetMap}
properties:
EndpointMap: {get_param: EndpointMap}
ServiceNetMap: {get_param: ServiceNetMap}
@@
-60,7
+60,7
@@
outputs:
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: 'neutron'
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: 'neutron'
- puppet_tags:
''
+ puppet_tags:
neutron_plugin_ml2
step_config: *step_config
config_image:
list_join:
step_config: *step_config
config_image:
list_join: