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 release note for generated sample environments"
[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
66a1397
..
7211014
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,8
+20,8
@@
parameters:
default: 'tripleoupstream'
type: string
DockerNeutronConfigImage:
default: 'tripleoupstream'
type: string
DockerNeutronConfigImage:
- description:
imag
e
- default: 'centos-binary-neutron-
openvswitch-agent
:latest'
+ description:
The container image to use for the neutron config_volum
e
+ default: 'centos-binary-neutron-
server
:latest'
type: string
DefaultPasswords:
default: {}
type: string
DefaultPasswords:
default: {}
@@
-33,6
+33,7
@@
parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
resources:
resources: