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 "Stop/disable l3 agent in docker service upgrade_tasks"
[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
357dcde
..
1739a5b
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
@@
-21,7
+21,7
@@
parameters:
type: string
DockerNeutronConfigImage:
description: image
type: string
DockerNeutronConfigImage:
description: image
- default: 'centos-binary-neutron-
openvswitch-agent
:latest'
+ default: 'centos-binary-neutron-
server
:latest'
type: string
DefaultPasswords:
default: {}
type: string
DefaultPasswords:
default: {}