summaryrefslogtreecommitdiffstats
path: root/environments/services-docker
diff options
context:
space:
mode:
Diffstat (limited to 'environments/services-docker')
-rw-r--r--environments/services-docker/congress.yaml2
-rw-r--r--environments/services-docker/manila.yaml1
-rw-r--r--environments/services-docker/neutron-opendaylight.yaml16
3 files changed, 18 insertions, 1 deletions
diff --git a/environments/services-docker/congress.yaml b/environments/services-docker/congress.yaml
index 5d4c7307..e1edd352 100644
--- a/environments/services-docker/congress.yaml
+++ b/environments/services-docker/congress.yaml
@@ -1,2 +1,2 @@
resource_registry:
- OS::TripleO::Services::Congress: ../../docker/services/congress-api.yaml
+ OS::TripleO::Services::Congress: ../../docker/services/congress.yaml
diff --git a/environments/services-docker/manila.yaml b/environments/services-docker/manila.yaml
index 795309f6..eacdb1a1 100644
--- a/environments/services-docker/manila.yaml
+++ b/environments/services-docker/manila.yaml
@@ -1,3 +1,4 @@
resource_registry:
OS::TripleO::Services::ManilaApi: ../../docker/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../../docker/services/manila-scheduler.yaml
+ OS::TripleO::Services::ManilaShare: ../../docker/services/manila-share.yaml
diff --git a/environments/services-docker/neutron-opendaylight.yaml b/environments/services-docker/neutron-opendaylight.yaml
new file mode 100644
index 00000000..b749cb69
--- /dev/null
+++ b/environments/services-docker/neutron-opendaylight.yaml
@@ -0,0 +1,16 @@
+# A Heat environment that can be used to deploy OpenDaylight with L3 DVR using Docker containers
+resource_registry:
+ OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
+ OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
+ OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
+ OS::TripleO::Services::OpenDaylightApi: ../../docker/services/opendaylight-api.yaml
+ OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml
+ OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+ OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-odl.yaml
+
+parameter_defaults:
+ NeutronEnableForceMetadata: true
+ NeutronMechanismDrivers: 'opendaylight_v2'
+ NeutronServicePlugins: 'odl-router_v2,trunk'
+ DockerNeutronApiImage: 'centos-binary-neutron-server-opendaylight:latest'
+ DockerNeutronConfigImage: 'centos-binary-neutron-server-opendaylight:latest'