diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-05 13:57:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-05 13:57:43 +0000 |
| commit | d61d11daba1c4d0189e225e227e94f0136dd7ec1 (patch) | |
| tree | a0f84aed57cc8962f35d3d475cbac29403dff84f /environments/docker.yaml | |
| parent | 3943c775abe4770e2e094a19419aec00012e9af0 (diff) | |
| parent | 24e855dae3822233a863bc27a105b08d112f57af (diff) | |
Merge "Adds docker OpenDaylight"
Diffstat (limited to 'environments/docker.yaml')
| -rw-r--r-- | environments/docker.yaml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml index 03713e83..c32001a7 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -6,6 +6,8 @@ resource_registry: OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml OS::TripleO::Services::Docker: ../puppet/services/docker.yaml + # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2 + OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml #NOTE (dprince) add roles to be docker enabled as we support them OS::TripleO::Services::NovaLibvirt: ../docker/services/nova-libvirt.yaml @@ -75,3 +77,4 @@ parameter_defaults: - OS::TripleO::Services::Docker - OS::TripleO::Services::CeilometerAgentCompute - OS::TripleO::Services::Sshd + - OS::TripleO::Services::OpenDaylightOvs |